From 4ef4a17f779b3e6d09667639c0f34980e1325f12 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 30 Aug 2017 17:53:03 +0200 Subject: nilfs-utils: fix build Just kill .libs to make sure patchelf does shrink-rpath correctly Complain in comments that patchelf/#98 is still not used by stdenv --- pkgs/tools/filesystems/nilfs-utils/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index c5cc4f053a23..80a0d566edcb 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -23,8 +23,14 @@ stdenv.mkDerivation rec { sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./lib/cleaner*.c ''; - # FIXME: Remove after https://github.com/NixOS/patchelf/pull/98 is in - dontPatchELF = true; + # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv + # still doesn't use it + # + # To make sure patchelf doesn't mistakenly keep the reference via + # build directory + postInstall = '' + find . -name .libs | xargs rm -rf + ''; meta = { description = "NILFS utilities"; -- cgit 1.4.1