ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity

treewide: Mass replace 'openssl}/bin' to refer to the correct outputs

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-10 22:51:13 +03:00 committed by Tuomas Tynkkynen
parent 87cb1b0ca1
commit 897e0d1224
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/nntp-proxy.nix
View File

@ -224,7 +224,7 @@ in
serviceConfig.ExecStart = "${nntp-proxy}/bin/nntp-proxy ${confFile}"; serviceConfig.ExecStart = "${nntp-proxy}/bin/nntp-proxy ${confFile}";
preStart = '' preStart = ''
if [ ! \( -f ${cfg.sslCert} -a -f ${cfg.sslKey} \) ]; then 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}; -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout ${cfg.sslKey} -out ${cfg.sslCert};
fi fi
''; '';

2
pkgs/tools/networking/easyrsa/2.x.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
for prog in $(find "$out/share/easy-rsa" -executable -type f); do for prog in $(find "$out/share/easy-rsa" -executable -type f); do
makeWrapper "$prog" "$out/bin/$(basename $prog)" \ makeWrapper "$prog" "$out/bin/$(basename $prog)" \
--set EASY_RSA "$out/share/easy-rsa" \ --set EASY_RSA "$out/share/easy-rsa" \
--set OPENSSL "${openssl}/bin/openssl" \ --set OPENSSL "${openssl.bin}/bin/openssl" \
--set GREP "${gnugrep}/bin/grep" --set GREP "${gnugrep}/bin/grep"
done done
sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars

4
pkgs/tools/security/cipherscan/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
substituteInPlace cipherscan \ substituteInPlace cipherscan \
--replace "@OPENSSLBIN@" \ --replace "@OPENSSLBIN@" \
"${openssl}/bin/openssl" \ "${openssl.bin}/bin/openssl" \
--replace "@TIMEOUTBIN@" \ --replace "@TIMEOUTBIN@" \
"${coreutils}/bin/timeout" \ "${coreutils}/bin/timeout" \
--replace "@READLINKBIN@" \ --replace "@READLINKBIN@" \
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
substituteInPlace analyze.py \ substituteInPlace analyze.py \
--replace "@OPENSSLBIN@" \ --replace "@OPENSSLBIN@" \
"${openssl}/bin/openssl" "${openssl.bin}/bin/openssl"
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin