dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

use security_tool in x509-system

Browse Source
This commit is contained in:
Jude Taylor 2015-06-30 16:11:16 -07:00
parent 7851df4454
commit ac3acae7a5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -209,12 +209,14 @@ self: super: {
# Prevents needing to add security_tool as a build tool to all of x509-system's # Prevents needing to add security_tool as a build tool to all of x509-system's
# dependencies. # dependencies.
# TODO: use pkgs.darwin.security_tool once we can build it # TODO: use pkgs.darwin.security_tool once we can build it
x509-system = let security_tool = "/usr"; x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
in overrideCabal super.x509-system (drv: { then let inherit (pkgs.darwin) security_tool;
patchPhase = (drv.patchPhase or "") + pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' 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 substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
''; '';
}); })
else super.x509-system;
double-conversion = if !pkgs.stdenv.isDarwin double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion then super.double-conversion