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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-02-01 20:46:16 +02:00
parent 3cc7fa0be9
commit 13b3f3f246
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/apache-httpd/owncloud.nix
View File

@ -333,7 +333,7 @@ let
'version' => '${config.package.version}',
'openssl' => '${pkgs.openssl}/bin/openssl'
'openssl' => '${pkgs.openssl.bin}/bin/openssl'
);

2
nixos/modules/system/boot/luksroot.nix
View File

@ -436,7 +436,7 @@ in
${optionalString luks.yubikeySupport ''
copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp
copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
copy_bin_and_libs ${pkgs.openssl}/bin/openssl
copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl
cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
strip -s pbkdf2-sha512

2
pkgs/applications/networking/mailreaders/mailpile/default.nix
View File

@ -21,7 +21,7 @@ pythonPackages.buildPythonPackage rec {
postInstall = ''
wrapProgram $out/bin/mailpile \
--prefix PATH ":" "${gnupg1orig}/bin:${openssl}/bin"
--prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin"
'';
meta = with stdenv.lib; {

2
pkgs/applications/virtualization/openstack/keystone.nix
View File

@ -33,7 +33,7 @@ pythonPackages.buildPythonPackage rec {
ldap ldappool webtest requests2 oslotest pep8 pymongo which
];
makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"];
makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];
postInstall = ''
# install .ini files

2
pkgs/development/libraries/opendkim/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/sbin/opendkim-genkey \
--prefix PATH : ${openssl}/bin
--prefix PATH : ${openssl.bin}/bin
'';
meta = with stdenv.lib; {

2
pkgs/development/tools/sslmate/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
JSONPP
TermReadKey
]}" \
--prefix PATH : "${openssl}/bin"
--prefix PATH : "${openssl.bin}/bin"
'';
meta = with stdenv.lib; {

4
pkgs/servers/http/nix-binary-cache/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace @bzip2@ "${bzip2.bin}/bin" \
--replace @gnused@ "${gnused}/bin" \
--replace @gnugrep@ "${gnugrep}/bin" \
--replace @openssl@ "${openssl}/bin" \
--replace @openssl@ "${openssl.bin}/bin" \
--replace @lighttpd@ "${lighttpd}/sbin" \
--replace @iproute@ "${iproute}/sbin" \
--replace "xXxXx" "xXxXx"
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
--replace @bzip2@ "${bzip2.bin}/bin" \
--replace @gnused@ "${gnused}/bin" \
--replace @gnugrep@ "${gnugrep}/bin" \
--replace @openssl@ "${openssl}/bin" \
--replace @openssl@ "${openssl.bin}/bin" \
--replace @lighttpd@ "${lighttpd}/sbin" \
--replace @iproute@ "${iproute}/sbin" \
--replace "xXxXx" "xXxXx"

2
pkgs/servers/shellinabox/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin"
'';
postInstall = ''

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

@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa
substituteInPlace $out/bin/easyrsa \
--subst-var out \
--subst-var-by openssl ${openssl}/bin/openssl
--subst-var-by openssl ${openssl.bin}/bin/openssl
# Helper utility
cat > $out/bin/easyrsa-init <<EOF

2
pkgs/tools/virtualization/ec2-ami-tools/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
for i in $out/bin/*; do
wrapProgram $i \
--set EC2_HOME $out \
--prefix PATH : ${ruby}/bin:${openssl}/bin
--prefix PATH : ${ruby}/bin:${openssl.bin}/bin
done
sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb

2
pkgs/top-level/python-packages.nix
View File

@ -279,7 +279,7 @@ in modules // {
doCheck = false;
patchPhase = ''
substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl"
'';
installPhase = ''