cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #68611 from aanderse/zhf/ike

Browse source 
ike: fix broken build
This commit is contained in:
worldofpeace 2019-09-13 14:40:59 -04:00 committed by GitHub
commit ed80711ca6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/networking/ike/default.nix
View file

@ -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 }: , gcc, nettools, iproute, linuxHeaders }:
# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # 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 # so I'm sticking with 3.4
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ike-2.2.1"; pname = "ike";
version = "2.2.1";
src = fetchurl { 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"; 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 = '' configurePhase = ''
mkdir -p $out/{bin,sbin,lib} mkdir -p $out/{bin,sbin,lib}

2
pkgs/top-level/all-packages.nix
View file

@ -18777,7 +18777,7 @@ in
stdenv = gccStdenv; stdenv = gccStdenv;
}; };
ike = callPackage ../applications/networking/ike { }; ike = callPackage ../applications/networking/ike { bison = bison2; };
ikiwiki = callPackage ../applications/misc/ikiwiki { ikiwiki = callPackage ../applications/misc/ikiwiki {
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;