summary refs log tree commit diff
path: root/pkgs/development/tools/misc/pahole/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-09-07 21:28:33 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-09-07 21:28:33 +0200
commit916793cf130a8269bbda881e9081370d74595538 (patch)
tree11c9e5d14f3178c6daf5a9c0a85f8a9e469ac356 /pkgs/development/tools/misc/pahole/default.nix
parent026c31dd9d6570fc6d7475c0102745cbfb0d6972 (diff)
parent86eaeb4c0a31e623c01f0d39fd5b3e64ce5f80b5 (diff)
downloadnixlib-916793cf130a8269bbda881e9081370d74595538.tar
nixlib-916793cf130a8269bbda881e9081370d74595538.tar.gz
nixlib-916793cf130a8269bbda881e9081370d74595538.tar.bz2
nixlib-916793cf130a8269bbda881e9081370d74595538.tar.lz
nixlib-916793cf130a8269bbda881e9081370d74595538.tar.xz
nixlib-916793cf130a8269bbda881e9081370d74595538.tar.zst
nixlib-916793cf130a8269bbda881e9081370d74595538.zip
Merge branch 'master' into systemd-219
Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/tools/misc/pahole/default.nix')
-rw-r--r--pkgs/development/tools/misc/pahole/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index 739cc7e5143d..38de21872b9f 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
 
   postInstall = ''
     for p in $out/bin/*; do
-      rpath=`patchelf --print-rpath $p`:$out
-      patchelf --set-rpath $rpath $p
+      rpath=`patchelf --print-rpath $p || true`:$out
+      patchelf --set-rpath "$rpath" $p || true
     done
   '';