nix: bump nixpkgs version

This commit is contained in:
Robert Vollmert
2022-07-16 00:14:25 +02:00
committed by Robert
parent 5ac4c29a9e
commit 23e4c7fe6e
5 changed files with 11 additions and 69 deletions
@@ -1,8 +1,8 @@
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index d4be8cc2428..3979698711f 100644
index db6e0101fec..108527df50c 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -43,9 +43,21 @@ let
@@ -44,9 +44,21 @@ let
substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
@@ -25,7 +25,7 @@ index d4be8cc2428..3979698711f 100644
setOutputFlags = false;
separateDebugInfo =
!stdenv.hostPlatform.isDarwin &&
@@ -95,7 +107,17 @@ let
@@ -102,7 +114,17 @@ let
configureFlags = [
"shared" # "shared" builds both shared and static libraries
"--libdir=lib"
@@ -44,17 +44,17 @@ index d4be8cc2428..3979698711f 100644
] ++ lib.optionals withCryptodev [
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"
@@ -126,6 +148,9 @@ let
@@ -140,6 +162,9 @@ let
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
rm "$out/lib/"*.a
fi
+
+ # 'etc' is a separate output on static builds only.
+ etc=$out
'' + lib.optionalString (!stdenv.hostPlatform.isWindows)
'') + lib.optionalString (!stdenv.hostPlatform.isWindows)
# Fix bin/c_rehash's perl interpreter line
#
@@ -147,14 +172,15 @@ let
@@ -161,14 +186,15 @@ let
mv $out/include $dev/
# remove dependency on Perl at runtime