diff options
| author | Jude Taylor <me@jude.bio> | 2015-06-30 16:11:16 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-07-10 10:41:07 -0700 |
| commit | ac3acae7a5a2884fda5751fbd62a8a56580de4b8 (patch) | |
| tree | d0e04e8487670702af55dc78bd604843a5d8d326 /pkgs/development/haskell-modules | |
| parent | 7851df44541588c8b089b863b6cd1239ed41e2aa (diff) | |
| download | nixlib-ac3acae7a5a2884fda5751fbd62a8a56580de4b8.tar nixlib-ac3acae7a5a2884fda5751fbd62a8a56580de4b8.tar.gz nixlib-ac3acae7a5a2884fda5751fbd62a8a56580de4b8.tar.bz2 nixlib-ac3acae7a5a2884fda5751fbd62a8a56580de4b8.tar.lz nixlib-ac3acae7a5a2884fda5751fbd62a8a56580de4b8.tar.xz nixlib-ac3acae7a5a2884fda5751fbd62a8a56580de4b8.tar.zst nixlib-ac3acae7a5a2884fda5751fbd62a8a56580de4b8.zip | |
use security_tool in x509-system
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c70fb5c0bc77..ad9f0b2c54af 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -209,12 +209,14 @@ self: super: { # Prevents needing to add security_tool as a build tool to all of x509-system's # dependencies. # TODO: use pkgs.darwin.security_tool once we can build it - x509-system = let security_tool = "/usr"; - in overrideCabal super.x509-system (drv: { - patchPhase = (drv.patchPhase or "") + pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' - substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security - ''; - }); + x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc + then let inherit (pkgs.darwin) security_tool; + in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { + patchPhase = (drv.patchPhase or "") + '' + substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security + ''; + }) + else super.x509-system; double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion |