openafs, digitalbitbox: amend hacks of removing $(pwd)

Just like commit 3af97fc9ee54f7e5

+15 -6
+9 -3
pkgs/applications/misc/digitalbitbox/default.nix
··· 103 cp src/hidapi/libusb/.libs/*.so* $out/lib 104 cp src/univalue/.libs/*.so* $out/lib 105 106 - # [RPATH][patchelf] Avoid forbidden reference error 107 - rm -rf $PWD 108 - 109 # Provide udev rules as documented in https://digitalbitbox.com/start_linux 110 mkdir -p "$out/etc/udev/rules.d" 111 ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} 112 ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52} 113 ''; 114 115 enableParallelBuilding = true;
··· 103 cp src/hidapi/libusb/.libs/*.so* $out/lib 104 cp src/univalue/.libs/*.so* $out/lib 105 106 # Provide udev rules as documented in https://digitalbitbox.com/start_linux 107 mkdir -p "$out/etc/udev/rules.d" 108 ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} 109 ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52} 110 + ''; 111 + 112 + # remove forbidden references to $TMPDIR 113 + preFixup = '' 114 + for f in "$out"/{bin,lib}/*; do 115 + if [ -f "$f" ] && isELF "$f"; then 116 + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" 117 + fi 118 + done 119 ''; 120 121 enableParallelBuilding = true;
+6 -3
pkgs/servers/openafs/1.8/default.nix
··· 117 cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen 118 ''; 119 120 - # Avoid references to $TMPDIR by removing it and let patchelf cleanup the 121 - # binaries. 122 preFixup = '' 123 - rm -rf "$(pwd)" && mkdir "$(pwd)" 124 ''; 125 126 meta = with lib; {
··· 117 cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen 118 ''; 119 120 + # remove forbidden references to $TMPDIR 121 preFixup = '' 122 + for f in "$out"/bin/*; do 123 + if isELF "$f"; then 124 + patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" 125 + fi 126 + done 127 ''; 128 129 meta = with lib; {