From a505abc9487ad2d6a069a9f236fc4156b7dd7c91 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 22 Oct 2017 13:58:28 +0200 Subject: [PATCH] libcap: already patch Make.Rules in prePatch Make.Rules gets already included during compilation, so set paths before invoking make. This fixes wrong paths in libcap.pc. --- pkgs/os-specific/linux/libcap/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 1cc8ab60d75..17cd40e427b 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -30,9 +30,8 @@ stdenv.mkDerivation rec { # ensure capsh can find bash in $PATH substituteInPlace progs/capsh.c --replace execve execvpe - ''; - preInstall = '' + # set prefixes substituteInPlace Make.Rules \ --replace 'prefix=/usr' "prefix=$lib" \ --replace 'exec_prefix=' "exec_prefix=$out" \