diff options
author | Ellie Hermaszewska <git@monoid.al> | 2021-11-08 18:33:48 +0800 |
---|---|---|
committer | Ellie Hermaszewska <git@monoid.al> | 2021-11-08 18:34:00 +0800 |
commit | 2413ab9e72fe4933c832cc216d6fbc23beef2f10 (patch) | |
tree | cbd292a05aae3f00d76d814d12e4e7349bab8000 /pkgs/development/haskell-modules/make-package-set.nix | |
parent | b0e58bafbe7623f9ea471ebc2b225f26fddff708 (diff) | |
download | nixlib-2413ab9e72fe4933c832cc216d6fbc23beef2f10.tar nixlib-2413ab9e72fe4933c832cc216d6fbc23beef2f10.tar.gz nixlib-2413ab9e72fe4933c832cc216d6fbc23beef2f10.tar.bz2 nixlib-2413ab9e72fe4933c832cc216d6fbc23beef2f10.tar.lz nixlib-2413ab9e72fe4933c832cc216d6fbc23beef2f10.tar.xz nixlib-2413ab9e72fe4933c832cc216d6fbc23beef2f10.tar.zst nixlib-2413ab9e72fe4933c832cc216d6fbc23beef2f10.zip |
haskellPackages.developPackage: Use haskell.lib.compose correctly
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 5d86a685e1bf..62bcf7dc84c3 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -159,7 +159,7 @@ let # (requiring it to be frequently rebuilt), which can be an # annoyance. callPackageKeepDeriver = src: args: - overrideCabal (self.callPackage src args) (orig: { + overrideCabal (orig: { preConfigure = '' # Generated from ${src} ${orig.preConfigure or ""} @@ -171,7 +171,7 @@ let # cabal2nixDeriver field. cabal2nixDeriver = src; }; - }); + }) (self.callPackage src args); in package-set { inherit pkgs lib callPackage; } self // { @@ -213,9 +213,9 @@ in package-set { inherit pkgs lib callPackage; } self // { then pkgs.lib.cleanSourceWith { inherit src filter; } else src; }; - in overrideCabal (callPackageKeepDeriver expr args) (orig: { + in overrideCabal (orig: { inherit src; - }); + }) (callPackageKeepDeriver expr args); callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args; |