diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-04-08 20:20:21 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-04-08 20:20:21 +0000 |
| commit | 277378c2a477bf65b259969b8d37d1bc4762fb34 (patch) | |
| tree | ac9d0258c6619c57dcd97d279d13bed32c32d84e | |
| parent | 771453ffc24b76a037f3811063ed58894c224cd3 (diff) | |
| download | nixpkgs-277378c2a477bf65b259969b8d37d1bc4762fb34.tar nixpkgs-277378c2a477bf65b259969b8d37d1bc4762fb34.tar.gz nixpkgs-277378c2a477bf65b259969b8d37d1bc4762fb34.tar.bz2 nixpkgs-277378c2a477bf65b259969b8d37d1bc4762fb34.tar.lz nixpkgs-277378c2a477bf65b259969b8d37d1bc4762fb34.tar.xz nixpkgs-277378c2a477bf65b259969b8d37d1bc4762fb34.tar.zst nixpkgs-277378c2a477bf65b259969b8d37d1bc4762fb34.zip | |
* Added wpa_supplicant.
svn path=/nixpkgs/trunk/; revision=8552
| -rw-r--r-- | pkgs/os-specific/linux/wireless-tools/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 25 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix index d61ce05f199..1a3922d5970 100644 --- a/pkgs/os-specific/linux/wireless-tools/default.nix +++ b/pkgs/os-specific/linux/wireless-tools/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "wireless-tools-29-pre12"; + name = "wireless-tools-29-pre17"; src = fetchurl { - url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre12.tar.gz; - sha256 = "12al9910k2d9a0464j1r1x3lcsyw36zd2hzbyqy357iplplkxnws"; + url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre17.tar.gz; + sha256 = "13488mk5q8zdb6z933287kf2sf2narkn4khni5z3x7y87jvrs127"; }; preBuild = " diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix new file mode 100644 index 00000000000..bf6795f4b1e --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, openssl}: + +stdenv.mkDerivation { + name = "wpa_supplicant-0.5.7"; + + src = fetchurl { + url = http://hostap.epitest.fi/releases/wpa_supplicant-0.5.7.tar.gz; + sha256 = "0mvb2fpvn7qdjinpn86hvmhfwg2ax1822hdkfrw25wx5dglqns6g"; + }; + + preBuild = " + cp defconfig .config + substituteInPlace Makefile --replace /usr/local $out + makeFlagsArray=(ALL=\"wpa_supplicant wpa_passphrase wpa_cli\") + "; + + buildInputs = [openssl]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9329945a001..206e75cd43d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2492,6 +2492,10 @@ rec { inherit fetchurl stdenv; }; + wpa_supplicant = import ../os-specific/linux/wpa_supplicant { + inherit fetchurl stdenv openssl; + }; + xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys { inherit stdenv xlibs expat; }; |