From 140e1de0ec3eea96cda68d2ce1724d55434dfe94 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 24 Nov 2014 20:50:17 -0500 Subject: [PATCH] strongswan: dont patchelf fixes #5045 ('fixes') --- pkgs/tools/networking/strongswan/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index e840d0507f6c..426396367024 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "05cjjd7gg65bl6fswj2r2i13nn1nk4x86s06y75gwfdvnlrsnlga"; }; + dontPatchELF = true; + buildInputs = [ gmp pkgconfig ]; configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54483719f111..01c364ca27c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2437,7 +2437,7 @@ let stunnel = callPackage ../tools/networking/stunnel { }; - strongswan = callPackage ../tools/networking/strongswan { stdenv = clangStdenv; }; + strongswan = callPackage ../tools/networking/strongswan { }; su = shadow.su;