···3636 patches = [(substituteAll {3737 src = ./0001-Fix-some-paths-for-Nix-build.patch;3838 libipasir = "${libipasir}/lib/${libipasir.libname}";3939- libssl = "${openssl.out}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";4040- libcrypto = "${openssl.out}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";3939+ libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";4040+ libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";4141 })];42424343 buildInputs = [···4747 # To build community books, we need Perl and a couple of utilities:4848 which perl hostname makeWrapper4949 # Some of the books require one or more of these external tools:5050- openssl.out glucose minisat abc-verifier libipasir5050+ glucose minisat abc-verifier libipasir5151 z3 (python2.withPackages (ps: [ ps.z3 ]))5252 ];5353
+1-1
pkgs/development/libraries/apr-util/default.nix
···5858 substituteInPlace $f \5959 --replace "${expat.dev}/lib" "${expat.out}/lib" \6060 --replace "${db.dev}/lib" "${db.out}/lib" \6161- --replace "${openssl.dev}/lib" "${openssl.out}/lib"6161+ --replace "${openssl.dev}/lib" "${lib.getLib openssl}/lib"6262 done63636464 # Give apr1 access to sed for runtime invocations.
···3434 # but it is not working as intended.3535 #patchPhase = ''3636 # substituteInPlace proton/srp/_ctsrp.py --replace \3737- # "ctypes.cdll.LoadLibrary('libssl.so.10')" "'${openssl.out}/lib/libssl.so'"3737+ # "ctypes.cdll.LoadLibrary('libssl.so.10')" "'${lib.getLib openssl}/lib/libssl.so'"3838 #'';3939 # Regarding the issue above, I'm disabling tests for now4040 doCheck = false;
···27272828 postPatch = ''2929 # patch cl-plus-ssl to ensure that it finds libssl and libcrypto3030- sed 's|libssl.so|${openssl.out}/lib/libssl.so|' -i ext/cl-plus-ssl/src/reload.lisp3131- sed 's|libcrypto.so|${openssl.out}/lib/libcrypto.so|' -i ext/cl-plus-ssl/src/reload.lisp3030+ sed 's|libssl.so|${lib.getLib openssl}/lib/libssl.so|' -i ext/cl-plus-ssl/src/reload.lisp3131+ sed 's|libcrypto.so|${lib.getLib openssl}/lib/libcrypto.so|' -i ext/cl-plus-ssl/src/reload.lisp3232 # patch dexador to avoid error due to dexador being loaded multiple times3333 sed -i 's/defpackage/uiop:define-package/g' ext/dexador/src/dexador.lisp3434 '';
···6565 moveToOutput bin/nsupdate $dnsutils66666767 for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do6868- sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'6868+ sed -i "$f" -e 's|-L${openssl.dev}|-L${lib.getLib openssl}|g'6969 done7070 '';7171
+1-1
pkgs/servers/monitoring/net-snmp/default.nix
···53535454 postInstall = ''5555 for f in "$lib/lib/"*.la $bin/bin/net-snmp-config $bin/bin/net-snmp-create-v3-user; do5656- sed 's|-L${openssl.dev}|-L${openssl.out}|g' -i $f5656+ sed 's|-L${openssl.dev}|-L${lib.getLib openssl}|g' -i $f5757 done5858 mkdir $dev/bin5959 mv $bin/bin/net-snmp-config $dev/bin
+1-1
pkgs/servers/openxpki/default.nix
···5353 preConfigure = ''5454 substituteInPlace core/server/Makefile.PL \5555 --replace "my \$openssl_inc_dir = ''';" "my \$openssl_inc_dir = '${openssl.dev}/include';" \5656- --replace "my \$openssl_lib_dir = ''';" "my \$openssl_lib_dir = '${openssl.out}/lib';" \5656+ --replace "my \$openssl_lib_dir = ''';" "my \$openssl_lib_dir = '${lib.getLib openssl}/lib';" \5757 --replace "my \$openssl_binary = ''';" "my \$openssl_binary = '${openssl.bin}/bin/openssl';"5858 substituteInPlace tools/vergen --replace "#!/usr/bin/perl" "#!${perl}/bin/perl"5959 cp ${./vergen_revision_state} .vergen_revision_state
+1-1
pkgs/servers/web-apps/lemmy/server.nix
···3232 # As of version 0.10.35 rust-openssl looks for openssl on darwin3333 # with a hardcoded path to /usr/lib/libssl.x.x.x.dylib3434 # https://github.com/sfackler/rust-openssl/blob/master/openssl-sys/build/find_normal.rs#L1153535- OPENSSL_LIB_DIR = "${openssl.out}/lib";3535+ OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";3636 OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";37373838 PROTOC = "${protobuf}/bin/protoc";
···2323 src = ./nix-purity.patch;2424 glibc = stdenv.cc.libc.dev or stdenv.cc.libc;2525 openssl_dev = openssl.dev;2626- openssl_out = openssl.out;2626+ openssl_lib = lib.getLib openssl;2727 })2828 # Without nonpriv.patch, pppd --version doesn't work when not run as root.2929 ./nonpriv.patch
···3232, withDNSTAP ? false3333, withTFO ? false3434, withRedis ? false3535-# Avoid .lib depending on openssl.out3535+# Avoid .lib depending on lib.getLib openssl3636# The build gets a little hacky, so in some cases we disable this approach.3737, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP3838, libnghttp2···110110111111 preFixup = lib.optionalString withSlimLib112112 # Build libunbound again, but only against nettle instead of openssl.113113- # This avoids gnutls.out -> unbound.lib -> openssl.out.113113+ # This avoids gnutls.out -> unbound.lib -> lib.getLib openssl.114114 ''115115 configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only"116116 configurePhase
+1-1
pkgs/tools/networking/uwimap/default.nix
···2929 postPatch = ''3030 sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},'3131 sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,'3232- sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,'3232+ sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${lib.getLib openssl}/lib,'3333 '';34343535 NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin