From d0f4678948b0e128e73ca4f5232b936bc02e38ef Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Sun, 30 Jun 2024 15:14:08 +0200 Subject: [PATCH] Fix callPackage still producing dynamic exes This was due to `staticHaskellBinariesOverlay` overlay changing every _existing_ package to build statically, but not every _new_ package called with `callPackage`. --- survey/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/survey/default.nix b/survey/default.nix index 69d87c6..13822eb 100644 --- a/survey/default.nix +++ b/survey/default.nix @@ -1709,11 +1709,15 @@ let ]) ]); in - final.lib.mapAttrs + (final.lib.mapAttrs (name: value: if (isProperHaskellPackage value && isExecutable value) then statify value else value ) - super + super) // { + callPackage = path: args: + let value = super.callPackage path args; in + if (isProperHaskellPackage value && isExecutable value) then statify value else value; + } ); }); };