diff options
| -rw-r--r-- | nixos/modules/services/networking/nntp-proxy.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/easyrsa/2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/cipherscan/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index cfa662c7311b..dca8ccac7627 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -224,7 +224,7 @@ in serviceConfig.ExecStart = "${nntp-proxy}/bin/nntp-proxy ${confFile}"; preStart = '' if [ ! \( -f ${cfg.sslCert} -a -f ${cfg.sslKey} \) ]; then - ${pkgs.openssl}/bin/openssl req -subj '/CN=AutoGeneratedCert/O=NixOS Service/C=US' \ + ${pkgs.openssl.bin}/bin/openssl req -subj '/CN=AutoGeneratedCert/O=NixOS Service/C=US' \ -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout ${cfg.sslKey} -out ${cfg.sslCert}; fi ''; 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 |