From 8b393304b190bbc92d949585fdadae4e50b1cfc8 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Mon, 2 Sep 2019 10:58:10 +0800 Subject: [win32] fix openssl --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/openssl') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0b026ae75f4e..f8e6a730e25f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -92,7 +92,7 @@ let rm "$out/lib/"*.a fi - '' + + '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWindows) '' mkdir -p $bin substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} -- cgit 1.4.1 From 2df354fd1e22ae46a0c412e221167c9ca5085bdd Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Fri, 6 Sep 2019 14:41:44 +0800 Subject: fix openssl --- pkgs/development/libraries/openssl/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/openssl') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f8e6a730e25f..03b92ccbc776 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -92,10 +92,14 @@ let rm "$out/lib/"*.a fi - '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWindows) + '' + '' mkdir -p $bin + '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + '' substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} + '' + + '' mv $out/bin $bin/ mkdir $dev @@ -107,7 +111,7 @@ let rmdir $out/etc/ssl/{certs,private} ''; - postFixup = '' + postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) '' # Check to make sure the main output doesn't depend on perl if grep -r '${buildPackages.perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 -- cgit 1.4.1