diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-10 22:51:13 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-14 08:32:20 +0300 |
| commit | 897e0d12242b7ac9b7970f6708bcf0c3b3622719 (patch) | |
| tree | 1634027517123eb296f394c0c5d6f82fc6e56586 /pkgs | |
| parent | 87cb1b0ca1c9c0be08eb4ee92397f87ae6126e10 (diff) | |
| download | nixlib-897e0d12242b7ac9b7970f6708bcf0c3b3622719.tar nixlib-897e0d12242b7ac9b7970f6708bcf0c3b3622719.tar.gz nixlib-897e0d12242b7ac9b7970f6708bcf0c3b3622719.tar.bz2 nixlib-897e0d12242b7ac9b7970f6708bcf0c3b3622719.tar.lz nixlib-897e0d12242b7ac9b7970f6708bcf0c3b3622719.tar.xz nixlib-897e0d12242b7ac9b7970f6708bcf0c3b3622719.tar.zst nixlib-897e0d12242b7ac9b7970f6708bcf0c3b3622719.zip | |
treewide: Mass replace 'openssl}/bin' to refer to the correct outputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/easyrsa/2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/cipherscan/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index e49c32aac704..493243cf81c8 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { for prog in $(find "$out/share/easy-rsa" -executable -type f); do makeWrapper "$prog" "$out/bin/$(basename $prog)" \ --set EASY_RSA "$out/share/easy-rsa" \ - --set OPENSSL "${openssl}/bin/openssl" \ + --set OPENSSL "${openssl.bin}/bin/openssl" \ --set GREP "${gnugrep}/bin/grep" done sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index bde9756ee1a0..eac237f2ff47 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildPhase = '' substituteInPlace cipherscan \ --replace "@OPENSSLBIN@" \ - "${openssl}/bin/openssl" \ + "${openssl.bin}/bin/openssl" \ --replace "@TIMEOUTBIN@" \ "${coreutils}/bin/timeout" \ --replace "@READLINKBIN@" \ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace analyze.py \ --replace "@OPENSSLBIN@" \ - "${openssl}/bin/openssl" + "${openssl.bin}/bin/openssl" ''; installPhase = '' mkdir -p $out/bin |