about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2017-10-22 13:58:28 +0200
committerFlorian Klink <flokli@flokli.de>2017-10-22 21:21:27 +0200
commita505abc9487ad2d6a069a9f236fc4156b7dd7c91 (patch)
treeea493a3029fe530bea5c7d97bb2f2eaa986f1dcd
parentf906d6d18e87f4e2ee8a47d4f6040c77fd6c7f1e (diff)
downloadnixlib-a505abc9487ad2d6a069a9f236fc4156b7dd7c91.tar
nixlib-a505abc9487ad2d6a069a9f236fc4156b7dd7c91.tar.gz
nixlib-a505abc9487ad2d6a069a9f236fc4156b7dd7c91.tar.bz2
nixlib-a505abc9487ad2d6a069a9f236fc4156b7dd7c91.tar.lz
nixlib-a505abc9487ad2d6a069a9f236fc4156b7dd7c91.tar.xz
nixlib-a505abc9487ad2d6a069a9f236fc4156b7dd7c91.tar.zst
nixlib-a505abc9487ad2d6a069a9f236fc4156b7dd7c91.zip
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.
-rw-r--r--pkgs/os-specific/linux/libcap/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 1cc8ab60d75a..17cd40e427b9 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" \