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

Revert "iproute: remove broken fan patch"

Browse Source 
This reverts commit 0d5a5307be because it
breaks evaluation. See #21561.
This commit is contained in:
Franz Pletz
2017-01-04 22:30:55 +01:00
parent 26dce1924e
commit 08d1f28818
4 changed files with 386 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/iproute/default.nix
+11 -1
View File
@@ -1,4 +1,6 @@
{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig }:
{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig
, enableFan ? false
}:
stdenv.mkDerivation rec {
name = "iproute2-${version}";
@@ -9,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0";
};
patches = lib.optionals enableFan [
# These patches were pulled from:
# https://launchpad.net/ubuntu/xenial/+source/iproute2
./1000-ubuntu-poc-fan-driver.patch
./1001-ubuntu-poc-fan-driver-v3.patch
./1002-ubuntu-poc-fan-driver-vxlan.patch
];
preConfigure = ''
patchShebangs ./configure
sed -e '/ARPDDIR/d' -i Makefile