From d46e78ed0f2e6debcb2184e349a2a7a1f45ac5c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 4 May 2017 17:21:52 +0200
Subject: [PATCH] libseccomp: Fix RPATH
Ensure that bin/scmp_sys_resolver doesn't have $TMPDIR in its RPATH.
I can't reproduce the issue reported in
98edb2436861e18ef73076c5a894a6a90e7db71c that required the addition of
a wrapper script. It seems to work fine without.
---
pkgs/development/libraries/libseccomp/default.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 1575a60ec699..3b365c0e9712 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
- postInstall = ''
- wrapProgram $out/bin/scmp_sys_resolver --prefix LD_LIBRARY_PATH ":" $out/lib
- '';
+ # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference.
+ preFixup = "rm -rfv src";
meta = with stdenv.lib; {
description = "High level library for the Linux Kernel seccomp filter";
@@ -27,4 +26,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ thoughtpolice wkennington ];
};
}
-