Unverified Commit aab90d87 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #248817 from Artturin/reffixes1

parents f0a56023 25eef240

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/libraries/qt-5/modules/qtwebkit.nix

+5 −4
Original line number Diff line number Diff line
@@ -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 = [