Merge pull request #248817 from Artturin/reffixes1

9 files changed, 17 insertions, 14 deletions

diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
index 39591eceb40d4..360fea56fedfb 100644
--- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
@@ -46,8 +46,8 @@ mkOpenModelicaDerivation ({
 
   preFixup = ''
     for entry in $(find $out -name libipopt.so); do
-      patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store $entry
-      patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" $entry
+      patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry"
+      patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" "$entry"
     done
   '';
 
diff --git a/pkgs/development/libraries/hipfft/default.nix b/pkgs/development/libraries/hipfft/default.nix
index 7f64cb3b57971..c4d13cb4f55e2 100644
--- a/pkgs/development/libraries/hipfft/default.nix
+++ b/pkgs/development/libraries/hipfft/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
   '' + lib.optionalString buildSamples ''
     mkdir -p $sample/bin
     mv clients/staging/hipfft_* $sample/bin
-    patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes /nix/store
+    patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
   '' + lib.optionalString (buildTests || buildBenchmarks) ''
     rmdir $out/bin
   '';
diff --git a/pkgs/development/libraries/hipsolver/default.nix b/pkgs/development/libraries/hipsolver/default.nix
index 0b7f3edc358d0..ff499b342f260 100644
--- a/pkgs/development/libraries/hipsolver/default.nix
+++ b/pkgs/development/libraries/hipsolver/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
   '' + lib.optionalString buildSamples ''
     mkdir -p $sample/bin
     mv clients/staging/example-* $sample/bin
-    patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes /nix/store
+    patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
   '' + lib.optionalString (buildTests || buildBenchmarks) ''
     rmdir $out/bin
   '';
diff --git a/pkgs/development/libraries/migraphx/default.nix b/pkgs/development/libraries/migraphx/default.nix
index 0cee9c3e42f6a..3b32b86f41aff 100644
--- a/pkgs/development/libraries/migraphx/default.nix
+++ b/pkgs/development/libraries/migraphx/default.nix
@@ -140,7 +140,7 @@ in stdenv.mkDerivation (finalAttrs: {
   '' + lib.optionalString buildTests ''
     mkdir -p $test/bin
     mv bin/test_* $test/bin
-    patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes /nix/store
+    patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
   '';
 
   passthru.updateScript = rocmUpdateScript {
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index a70ebd3fb74fc..fc1766488ecc8 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -47,12 +47,13 @@ qtModule {
 
   doCheck = false; # fails 13 out of 13 tests (ctest)
 
-  # Hack to avoid TMPDIR in RPATHs.
-  preFixup = ''
-    rm -rf "$(pwd)"
-    mkdir "$(pwd)"
+  # remove forbidden references to $TMPDIR
+  preFixup = lib.optionalString stdenv.isLinux ''
+    patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/libexec/*
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     maintainers = with lib.maintainers; [ abbradar periklis ];
     knownVulnerabilities = [
diff --git a/pkgs/development/pharo/default.nix b/pkgs/development/pharo/default.nix
index 6e83a31d5dd51..2cf98d4936987 100644
--- a/pkgs/development/pharo/default.nix
+++ b/pkgs/development/pharo/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
     mkdir "$out/bin"
     cp build/vm/*.so* "$out/lib/"
     cp build/vm/pharo "$out/bin/pharo"
-    patchelf --allowed-rpath-prefixes /nix/store --shrink-rpath "$out/bin/pharo"
+    patchelf --allowed-rpath-prefixes "$NIX_STORE" --shrink-rpath "$out/bin/pharo"
     wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}"
 
     runHook postInstall
diff --git a/pkgs/development/tools/misc/rdc/default.nix b/pkgs/development/tools/misc/rdc/default.nix
index 110b38de75f82..906f35b47c52d 100644
--- a/pkgs/development/tools/misc/rdc/default.nix
+++ b/pkgs/development/tools/misc/rdc/default.nix
@@ -102,7 +102,7 @@ in stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     find $out/bin -executable -type f -exec \
-      patchelf {} --shrink-rpath --allowed-rpath-prefixes /nix/store \;
+      patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \;
   '' + lib.optionalString buildTests ''
     mkdir -p $test
     mv $out/bin/rdctst_tests $test/bin
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 11b146e55c5ea..db3f9e6664e1a 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -35,8 +35,10 @@ in stdenv.mkDerivation rec {
   buildInputs = [ libelf freeglut libGLU libGL ]
     ++ lib.optional stdenv.isDarwin GLUT;
 
-  # Hack to avoid TMPDIR in RPATHs.
-  preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
+  # remove forbidden references to $TMPDIR
+  preFixup = lib.optionalString stdenv.isLinux ''
+    patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/*
+  '';
 
   doCheck = true;
   checkTarget = "-C tests run_tests";
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 144533621b750..df4337a6caffc 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   # remove forbidden reference to $TMPDIR
   preFixup = ''
-    patchelf --shrink-rpath --allowed-rpath-prefixes "/nix/store" "$out/sbin/smbios-sys-info-lite"
+    patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out/sbin/smbios-sys-info-lite"
   '';
 
   meta = with lib; {