Commit 25eef240 authored by Artturin's avatar Artturin
Browse files

treewide: Don't hardcode nix store in patchelf calls

parent 5c6ae886

pkgs/applications/science/misc/openmodelica/omcompiler/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  '';

pkgs/development/libraries/hipfft/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

  '';

pkgs/development/libraries/hipsolver/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

  '';

pkgs/development/libraries/migraphx/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 {

pkgs/development/pharo/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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