diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-20 21:55:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 21:55:24 -0400 |
| commit | 8a41a11d6696040025bbc49e76f1ff4957b4cc2d (patch) | |
| tree | f32ab1476d3f981f5686b96d095ee8024506ad64 /pkgs/development/haskell-modules | |
| parent | 7736337916538aab67a00739c53b8434da773a3b (diff) | |
| parent | 45c637d8a018ac670c784a9ffc89ed3013e8d6a9 (diff) | |
| download | nixpkgs-8a41a11d6696040025bbc49e76f1ff4957b4cc2d.tar nixpkgs-8a41a11d6696040025bbc49e76f1ff4957b4cc2d.tar.gz nixpkgs-8a41a11d6696040025bbc49e76f1ff4957b4cc2d.tar.bz2 nixpkgs-8a41a11d6696040025bbc49e76f1ff4957b4cc2d.tar.lz nixpkgs-8a41a11d6696040025bbc49e76f1ff4957b4cc2d.tar.xz nixpkgs-8a41a11d6696040025bbc49e76f1ff4957b4cc2d.tar.zst nixpkgs-8a41a11d6696040025bbc49e76f1ff4957b4cc2d.zip | |
Merge pull request #47096 from obsidiansystems/fix-x509-system
haskellPackages.x509-system: Override based on the host, not target platform
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a516b764510..c3df7d38bfd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -126,9 +126,9 @@ self: super: builtins.intersectAttrs super { # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - # Prevents needing to add security_tool as a build tool to all of x509-system's - # dependencies. - x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc + # Prevents needing to add `security_tool` as a run-time dependency for + # everything using x509-system to give access to the `security` executable. + x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc then let inherit (pkgs.darwin) security_tool; in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { postPatch = (drv.postPatch or "") + '' |