From 5c6ae8863d1dea6684f7db26aeb5e4d9d7f5acf7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 13 Aug 2023 05:40:01 +0300 Subject: [PATCH] treewide: Amend hacks of removing $(pwd) The strip phase is using $TMPDIR now, so it would fail with: `mktemp: failed to create file via template 'striperr.XXXXXX': No such file or directory` --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 9 +++++---- pkgs/development/tools/simavr/default.nix | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index a70ebd3fb74f..fc1766488ecc 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/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 11b146e55c5e..db3f9e6664e1 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";