Created
October 22, 2017 14:59
-
-
Save flokli/b716eaa61f81e277bceca13d2eccc760 to your computer and use it in GitHub Desktop.
0001-libcap-already-patch-Make.Rules-in-prePatch.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 43650a93d6714236f88a202e99971e75d2c94d2c Mon Sep 17 00:00:00 2001 | |
From: Florian Klink <flokli@flokli.de> | |
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 1cc8ab60d7..17cd40e427 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" \ | |
-- | |
2.14.2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment