ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

treewide: amend hacks of removing $(pwd)

Browse Source 
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
This commit is contained in:
Vladimír Čunát 2023-08-05 09:23:43 +02:00
parent 630052f3e6
commit 3af97fc9ee
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
6 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/bigloo/default.nix
View File

@ -45,8 +45,14 @@ stdenv.mkDerivation rec {
checkTarget = "test"; checkTarget = "test";
# Hack to avoid TMPDIR in RPATHs. # remove forbidden references to $TMPDIR
preFixup = ''rm -rf "$(pwd)" ''; preFixup = lib.optionalString stdenv.isLinux ''
for f in "$out"/bin/*; do
if isELF "$f"; then
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
fi
done
'';
meta = { meta = {
description = "Efficient Scheme compiler"; description = "Efficient Scheme compiler";

4
pkgs/development/libraries/accounts-qt/default.nix
View File

@ -14,9 +14,9 @@ mkDerivation rec {
propagatedBuildInputs = [ glib libaccounts-glib ]; propagatedBuildInputs = [ glib libaccounts-glib ];
nativeBuildInputs = [ doxygen pkg-config qmake ]; nativeBuildInputs = [ doxygen pkg-config qmake ];
# remove forbidden reference to $TMPDIR # remove forbidden references to $TMPDIR
preFixup = '' preFixup = ''
patchelf --shrink-rpath --allowed-rpath-prefixes "/nix/store" "$out"/bin/* patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/*
''; '';
meta = with lib; { meta = with lib; {

10
pkgs/development/libraries/libdwg/default.nix
View File

@ -13,8 +13,14 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
# Hack to avoid TMPDIR in RPATHs. # remove forbidden references to $TMPDIR
preFixup = ''rm -rf "$(pwd)" ''; preFixup = lib.optionalString stdenv.isLinux ''
for f in "$out"/bin/*; do
if isELF "$f"; then
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
fi
done
'';
meta = { meta = {
description = "Library reading dwg files"; description = "Library reading dwg files";

11
pkgs/development/libraries/libftdi/default.nix
View File

@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libusb-compat-0_1 ]; propagatedBuildInputs = [ libusb-compat-0_1 ];
# Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" '';
configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode"; configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode";
# allow async mode. from ubuntu. see: # allow async mode. from ubuntu. see:
@ -31,6 +29,15 @@ stdenv.mkDerivation rec {
--replace "ifdef USB_CLASS_PTP" "if 0" --replace "ifdef USB_CLASS_PTP" "if 0"
''; '';
# remove forbidden references to $TMPDIR
preFixup = lib.optionalString stdenv.isLinux ''
for f in "$out"/bin/*; do
if isELF "$f"; then
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
fi
done
'';
meta = { meta = {
description = "A library to talk to FTDI chips using libusb"; description = "A library to talk to FTDI chips using libusb";
homepage = "https://www.intra2net.com/en/developer/libftdi/"; homepage = "https://www.intra2net.com/en/developer/libftdi/";

10
pkgs/games/klavaro/default.nix
View File

@ -39,8 +39,14 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/file" "${file}/bin/file" --replace "/usr/bin/file" "${file}/bin/file"
''; '';
# Hack to avoid TMPDIR in RPATHs. # remove forbidden references to $TMPDIR
preFixup = ''rm -rf "$(pwd)" ''; preFixup = lib.optionalString stdenv.isLinux ''
for f in "$out"/bin/*; do
if isELF "$f"; then
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
fi
done
'';
meta = with lib; { meta = with lib; {
description = "Free touch typing tutor program"; description = "Free touch typing tutor program";

6
pkgs/tools/security/ssdeep/default.nix
View File

@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
# Hack to avoid TMPDIR in RPATHs. # remove forbidden references to $TMPDIR
preFixup = ''rm -rf "$(pwd)" ''; preFixup = lib.optionalString stdenv.isLinux ''
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/*
'';
meta = { meta = {
description = "A program for calculating fuzzy hashes"; description = "A program for calculating fuzzy hashes";