mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 03:30:45 +00:00
treewide: Mass replace 'openssl}/bin' to refer to the correct outputs
This commit is contained in:
parent
87cb1b0ca1
commit
897e0d1224
|
@ -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
|
||||
'';
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue