pyrox.dev
Merge pull request #248817 from Artturin/reffixes1
+2
-2
pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
+2
-2
pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
···
46
46
47
47
preFixup = ''
48
48
for entry in $(find $out -name libipopt.so); do
49
-
patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store $entry
50
-
patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" $entry
49
+
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry"
50
+
patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" "$entry"
51
51
done
52
52
'';
53
53
+1
-1
pkgs/development/libraries/hipfft/default.nix
+1
-1
pkgs/development/libraries/hipfft/default.nix
···
85
85
'' + lib.optionalString buildSamples ''
86
86
mkdir -p $sample/bin
87
87
mv clients/staging/hipfft_* $sample/bin
88
-
patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes /nix/store
88
+
patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
89
89
'' + lib.optionalString (buildTests || buildBenchmarks) ''
90
90
rmdir $out/bin
91
91
'';
+1
-1
pkgs/development/libraries/hipsolver/default.nix
+1
-1
pkgs/development/libraries/hipsolver/default.nix
···
78
78
'' + lib.optionalString buildSamples ''
79
79
mkdir -p $sample/bin
80
80
mv clients/staging/example-* $sample/bin
81
-
patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes /nix/store
81
+
patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
82
82
'' + lib.optionalString (buildTests || buildBenchmarks) ''
83
83
rmdir $out/bin
84
84
'';
+1
-1
pkgs/development/libraries/migraphx/default.nix
+1
-1
pkgs/development/libraries/migraphx/default.nix
···
140
140
'' + lib.optionalString buildTests ''
141
141
mkdir -p $test/bin
142
142
mv bin/test_* $test/bin
143
-
patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes /nix/store
143
+
patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
144
144
'';
145
145
146
146
passthru.updateScript = rocmUpdateScript {
+5
-4
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+5
-4
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
···
47
47
48
48
doCheck = false; # fails 13 out of 13 tests (ctest)
49
49
50
-
# Hack to avoid TMPDIR in RPATHs.
51
-
preFixup = ''
52
-
rm -rf "$(pwd)"
53
-
mkdir "$(pwd)"
50
+
# remove forbidden references to $TMPDIR
51
+
preFixup = lib.optionalString stdenv.isLinux ''
52
+
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/libexec/*
54
53
'';
54
+
55
+
enableParallelBuilding = true;
55
56
56
57
meta = {
57
58
maintainers = with lib.maintainers; [ abbradar periklis ];
+1
-1
pkgs/development/pharo/default.nix
+1
-1
pkgs/development/pharo/default.nix
···
77
77
mkdir "$out/bin"
78
78
cp build/vm/*.so* "$out/lib/"
79
79
cp build/vm/pharo "$out/bin/pharo"
80
-
patchelf --allowed-rpath-prefixes /nix/store --shrink-rpath "$out/bin/pharo"
80
+
patchelf --allowed-rpath-prefixes "$NIX_STORE" --shrink-rpath "$out/bin/pharo"
81
81
wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}"
82
82
83
83
runHook postInstall
+1
-1
pkgs/development/tools/misc/rdc/default.nix
+1
-1
pkgs/development/tools/misc/rdc/default.nix
···
102
102
103
103
postInstall = ''
104
104
find $out/bin -executable -type f -exec \
105
-
patchelf {} --shrink-rpath --allowed-rpath-prefixes /nix/store \;
105
+
patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \;
106
106
'' + lib.optionalString buildTests ''
107
107
mkdir -p $test
108
108
mv $out/bin/rdctst_tests $test/bin
+4
-2
pkgs/development/tools/simavr/default.nix
+4
-2
pkgs/development/tools/simavr/default.nix
···
35
35
buildInputs = [ libelf freeglut libGLU libGL ]
36
36
++ lib.optional stdenv.isDarwin GLUT;
37
37
38
-
# Hack to avoid TMPDIR in RPATHs.
39
-
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
38
+
# remove forbidden references to $TMPDIR
39
+
preFixup = lib.optionalString stdenv.isLinux ''
40
+
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/*
41
+
'';
40
42
41
43
doCheck = true;
42
44
checkTarget = "-C tests run_tests";
+1
-1
pkgs/os-specific/linux/libsmbios/default.nix
+1
-1
pkgs/os-specific/linux/libsmbios/default.nix
···
37
37
38
38
# remove forbidden reference to $TMPDIR
39
39
preFixup = ''
40
-
patchelf --shrink-rpath --allowed-rpath-prefixes "/nix/store" "$out/sbin/smbios-sys-info-lite"
40
+
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out/sbin/smbios-sys-info-lite"
41
41
'';
42
42
43
43
meta = with lib; {