diff options
author | Marc Weber <marco-oweber@gmx.de> | 2010-04-27 04:38:41 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2010-04-27 04:38:41 +0000 |
commit | 9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857 (patch) | |
tree | 6962972a0ee04df97890cb78b7d3feff942bd2b9 /pkgs/os-specific/linux/wpa_supplicant | |
parent | 8bf3f76256f56e3aad91a690882e78e768aafb02 (diff) | |
download | nixlib-9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857.tar nixlib-9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857.tar.gz nixlib-9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857.tar.bz2 nixlib-9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857.tar.lz nixlib-9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857.tar.xz nixlib-9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857.tar.zst nixlib-9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857.zip |
wpa_supplicant: enable qt gui, deprecate old broken derivation building gui
svn path=/nixpkgs/trunk/; revision=21332
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 5e2e4b2972c6..be7c5a38c2a6 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,12 @@ -{stdenv, fetchurl, openssl, qt4 ? null}: +{stdenv, fetchurl, openssl +, guiSupport ? false +, qt4}: + +assert !guiSupport || qt4 != null; + +let + buildDirs = "wpa_supplicant wpa_passphrase wpa_cli"; +in stdenv.mkDerivation rec { name = "wpa_supplicant-0.7.2"; @@ -13,19 +21,33 @@ stdenv.mkDerivation rec { cp defconfig .config echo CONFIG_DEBUG_SYSLOG=y >> .config substituteInPlace Makefile --replace /usr/local $out - makeFlagsArray=(ALL="wpa_supplicant wpa_passphrase wpa_cli ${if qt4 == null then "" else "wpa_gui-qt4"}") + makeFlagsArray=(ALL="${buildDirs} ${if guiSupport then "wpa_gui-qt4" else ""}") ''; - buildInputs = [openssl qt4]; + buildInputs = [openssl] + ++ stdenv.lib.optional guiSupport qt4; + + # qt gui doesn't install because the executable is named differently from directory name + # so never include wpa_gui_-qt4 in buildDirs when running make install + preInstall = if guiSupport then '' + makeFlagsArray=(ALL="${buildDirs}") + '' else null; postInstall = '' ensureDir $out/share/man/man5 $out/share/man/man8 cp doc/docbook/*.5 $out/share/man/man5/ cp doc/docbook/*.8 $out/share/man/man8/ - ''; + '' + + (if guiSupport then '' + pwd + cp wpa_gui-qt4/wpa_gui $out/sbin + '' else ""); meta = { homepage = http://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; + } |