From a51a542d605ba3dc9daa4af25834f529d0dd8c00 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 6 May 2021 18:14:00 +0200 Subject: [PATCH] haskellPackages: fix eval of darwin specific overrides --- .../haskell-modules/configuration-nix.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 91cfafcb943..e7c8b74afea 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -858,15 +858,15 @@ self: super: builtins.intersectAttrs super { '' + (drv.postInstall or ""); }); - # TODO(@sternenseemann): can we determine this statically in cabal2nix? - FractalArt = super.FractalArt.override - (lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { - objc = pkgs.darwin.libojc; - }); + FractalArt = overrideCabal super.FractalArt (drv: { + librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ + pkgs.darwin.libobjc + ] ++ (drv.librarySystemDepends or []); + }); arbtt = overrideCabal super.arbtt (drv: { - librarySystemDepends = lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ + librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation - ] ++ (drv.librarySystemDepends or []) + ] ++ (drv.librarySystemDepends or []); }); }