diff options
| author | Shea Levy <shea@shealevy.com> | 2014-09-19 01:09:00 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-09-19 01:09:00 -0400 |
| commit | e0cd3ac03cfbb6af3afb5b100b7832c5ec444623 (patch) | |
| tree | 128840504a4d3572cddf896776cc3bd3a476c823 /pkgs/tools/networking/strongswan | |
| parent | 1ff027b304d98e07c4ef23c6a6f873fb2ec0ccb1 (diff) | |
| download | nixlib-e0cd3ac03cfbb6af3afb5b100b7832c5ec444623.tar nixlib-e0cd3ac03cfbb6af3afb5b100b7832c5ec444623.tar.gz nixlib-e0cd3ac03cfbb6af3afb5b100b7832c5ec444623.tar.bz2 nixlib-e0cd3ac03cfbb6af3afb5b100b7832c5ec444623.tar.lz nixlib-e0cd3ac03cfbb6af3afb5b100b7832c5ec444623.tar.xz nixlib-e0cd3ac03cfbb6af3afb5b100b7832c5ec444623.tar.zst nixlib-e0cd3ac03cfbb6af3afb5b100b7832c5ec444623.zip | |
strongswan: Fix some hard-coding
Diffstat (limited to 'pkgs/tools/networking/strongswan')
| -rw-r--r-- | pkgs/tools/networking/strongswan/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/strongswan/respect-path.patch | 19 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 0187f2ba5167..960da95120ef 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -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 = { diff --git a/pkgs/tools/networking/strongswan/respect-path.patch b/pkgs/tools/networking/strongswan/respect-path.patch new file mode 100644 index 000000000000..82f6a356b85a --- /dev/null +++ b/pkgs/tools/networking/strongswan/respect-path.patch @@ -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 |