diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-09-12 15:55:52 -0400 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2019-09-12 18:50:01 -0400 |
| commit | beeaf5a5b130c031e56ba37ec37c2f8837f49d67 (patch) | |
| tree | cfa48937902a48b3fb3367e6dcfcdabff55a97c7 | |
| parent | 2a10e8fef5f13a4b941fedd21e26f75dd291c108 (diff) | |
| download | nixlib-beeaf5a5b130c031e56ba37ec37c2f8837f49d67.tar nixlib-beeaf5a5b130c031e56ba37ec37c2f8837f49d67.tar.gz nixlib-beeaf5a5b130c031e56ba37ec37c2f8837f49d67.tar.bz2 nixlib-beeaf5a5b130c031e56ba37ec37c2f8837f49d67.tar.lz nixlib-beeaf5a5b130c031e56ba37ec37c2f8837f49d67.tar.xz nixlib-beeaf5a5b130c031e56ba37ec37c2f8837f49d67.tar.zst nixlib-beeaf5a5b130c031e56ba37ec37c2f8837f49d67.zip | |
ike: fix broken build
Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
| -rw-r--r-- | pkgs/applications/networking/ike/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 7953f35507d1..3baa1352a809 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper +{ stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; @@ -8,14 +8,25 @@ # so I'm sticking with 3.4 stdenv.mkDerivation rec { - name = "ike-2.2.1"; + pname = "ike"; + version = "2.2.1"; src = fetchurl { - url = "https://www.shrew.net/download/ike/${name}-release.tgz"; + url = "https://www.shrew.net/download/ike/${pname}-${version}-release.tgz"; sha256 = "0fhyr2psd93b0zf7yfb72q3nqnh65mymgq5jpjcsj9jv5kfr6l8y"; }; - buildInputs = [ cmake openssl libedit flex bison qt4 makeWrapper nettools iproute ]; + patches = [ + # required for openssl 1.1.x compatibility + (fetchpatch { + name = "openssl-1.1.0.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/openssl-1.1.0.patch?h=ike&id=3a56735ddc26f750df4720f4baba0728bb4cb458"; + sha256 = "1hw8q4xy858rivpjkq5288q3mc75d52bg4w3n30y99h05wik0h51"; + }) + ]; + + nativeBuildInputs = [ cmake flex bison makeWrapper ]; + buildInputs = [ openssl libedit qt4 nettools iproute ]; configurePhase = '' mkdir -p $out/{bin,sbin,lib} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280041646b4f..2f3037378063 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18778,7 +18778,7 @@ in stdenv = gccStdenv; }; - ike = callPackage ../applications/networking/ike { }; + ike = callPackage ../applications/networking/ike { bison = bison2; }; ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; |