diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2013-03-28 18:34:36 +0100 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-03-28 18:35:19 +0100 |
commit | e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81 (patch) | |
tree | 9b1cb9c76c079f2156941d3a1a395f4becce827d /pkgs | |
parent | 5f677039c77a4d9c6fcbe9b99980eab34fae65f3 (diff) | |
download | nixlib-e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81.tar nixlib-e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81.tar.gz nixlib-e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81.tar.bz2 nixlib-e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81.tar.lz nixlib-e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81.tar.xz nixlib-e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81.tar.zst nixlib-e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81.zip |
wpa_supplicant: Making a remote patch local.
upstream is down
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/libnl.patch | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index b3d94e26396e..8f441303c255 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -38,13 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = - [ (fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant"; - name = "hostap_allow-linking-with-libnl-3.2.patch"; - sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2"; - }) - ]; + patches = [ ./libnl.patch ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch new file mode 100644 index 000000000000..ede6dad721c5 --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch @@ -0,0 +1,13 @@ +diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak +--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 ++++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 +@@ -48,7 +48,7 @@ NEED_RFKILL=y + ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 +- DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` + else + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny + |