pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #248817 from Artturin/reffixes1

authored by Artturi and committed by GitHub aab90d87 f0a56023

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