JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #59920 from liclac/update/jool-v4.0.0

Browse Source 
jool: unstable-20180706 -> 4.0.0
This commit is contained in:
Franz Pletz 2019-04-23 23:12:17 +00:00 committed by GitHub
commit afe0d73e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/linux/jool/cli.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl, iptables }:
let let
sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
@ -9,15 +9,13 @@ stdenv.mkDerivation {
src = sourceAttrs.src; src = sourceAttrs.src;
setSourceRoot = ''
sourceRoot=$(echo */usr)
'';
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libnl ]; buildInputs = [ libnl iptables ];
postPatch = '' makeFlags = "-C src/usr";
chmod u+w -R ../common
prePatch = ''
sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/os-specific/linux/jool/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchFromGitHub, kernel }: { stdenv, fetchFromGitHub, kernel }:
assert stdenv.lib.versionOlder kernel.version "4.18";
let let
sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
in in
@ -15,15 +13,15 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
prePatch = '' prePatch = ''
sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i mod/*/Makefile sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile
''; '';
buildPhase = '' buildPhase = ''
make -C mod make -C src/mod
''; '';
installPhase = '' installPhase = ''
make -C mod modules_install INSTALL_MOD_PATH=$out make -C src/mod modules_install INSTALL_MOD_PATH=$out
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/os-specific/linux/jool/source.nix
View File

@ -1,11 +1,11 @@
{ fetchFromGitHub }: { fetchFromGitHub }:
rec { rec {
version = "unstable-20180706"; version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NICMx"; owner = "NICMx";
repo = "Jool"; repo = "Jool";
rev = "de791931d94e972c36bb3c102a9cadab5230c285"; rev = "v${version}";
sha256 = "09mr7lc9k17znpslsfmndx4vgl240llcgblxm92fizmwz23y1d6c"; sha256 = "1ivnx7ijqf41kxmi2bmsf9qfcv6b1rvag35754ddlndry3sgvimr";
}; };
} }