mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
strongswan: Fix some hard-coding
This commit is contained in:
parent
1ff027b304
commit
e0cd3ac03c
2 changed files with 24 additions and 0 deletions
|
@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1ki6v9c54ykppqnj3prgh62na97yajnvnm2zr1gjxzv05syk035h";
|
||||
};
|
||||
|
||||
patches = [ ./respect-path.patch ];
|
||||
|
||||
# --sysconfdir=/etc makes the build try to write to /etc...
|
||||
NIX_CFLAGS_COMPILE = "-DIPSEC_CONFDIR=\"/etc\"";
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
meta = {
|
||||
|
|
19
pkgs/tools/networking/strongswan/respect-path.patch
Normal file
19
pkgs/tools/networking/strongswan/respect-path.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
commit 09c4ae5b7bcd7057bede788f02c1d2d30aeeacda
|
||||
Author: Shea Levy <shea@shealevy.com>
|
||||
Date: Thu Sep 18 02:00:03 2014 -0400
|
||||
|
||||
ipsec script: just append to PATH if already set
|
||||
|
||||
diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in
|
||||
index e6725d0..82041f4 100644
|
||||
--- a/src/ipsec/_ipsec.in
|
||||
+++ b/src/ipsec/_ipsec.in
|
||||
@@ -15,7 +15,7 @@
|
||||
# for more details.
|
||||
|
||||
# define a minimum PATH environment in case it is not set
|
||||
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@IPSEC_SBINDIR@:@IPSEC_BINDIR@"
|
||||
+PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}:@IPSEC_SBINDIR@:@IPSEC_BINDIR@"
|
||||
export PATH
|
||||
|
||||
# set daemon name
|
Loading…
Reference in a new issue