From 5ae928e18fe5b4093d96c6c4bf006ff2eb05109e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 24 Apr 2020 19:57:31 +0200 Subject: [PATCH] lapack: fix darwin library identifiers The build system already sets these properly to the absolute path so no need to patch the libraries on darwin. $ otool -D result/lib/liblapacke.dylib result/lib/liblapacke.dylib: /nix/store/k88gy5s765yn3dc5ws3jbykyvklm7z96-openblas-0.3.8/lib/libopenblasp-r0.3.8.dylib Fixes #85713 --- pkgs/build-support/alternatives/lapack/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 5a19916f83e..98b458b778a 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -54,10 +54,6 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' - install_name_tool -id liblapack${canonicalExtension} \ - -add_rpath ${lib.getLib lapackProvider}/lib \ - $out/lib/liblapack${canonicalExtension} '' else "") + '' if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then @@ -87,10 +83,6 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' - install_name_tool -id liblapacke${canonicalExtension} \ - -add_rpath ${lib.getLib lapackProvider}/lib \ - $out/lib/liblapacke${canonicalExtension} '' else "") + '' if [ -f "$out/lib/liblapacke.so.3" ]; then