diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
| commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
| tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/os-specific/linux | |
| parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
| parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) | |
| download | nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.gz nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.bz2 nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.lz nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.xz nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.tar.zst nixpkgs-84c018503859be28aded86677c9dbc54c7067e11.zip | |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/udisks/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 191f34489a7..30353be390c 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm -, libxslt, docbook_xsl, utillinux, automake, autoconf }: +, libxslt, docbook_xsl, utillinux +, automake, autoconf, libtool, gtkdoc }: stdenv.mkDerivation rec { name = "udisks-1.0.4"; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; - buildNativeInputs = [ automake autoconf pkgconfig ]; + buildNativeInputs = [ automake autoconf libtool gtkdoc pkgconfig ]; configureFlags = "--localstatedir=/var --enable-lvm2"; @@ -34,7 +35,9 @@ stdenv.mkDerivation rec { "/sbin:/bin:/usr/sbin:/usr/bin" \ "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" - automake + # The patch above modifies Makefile.am, so redo the whole thing. + # FIXME: Remove that ASAP---e.g., by writing the patch differently. + autoreconf -vfi ''; meta = { diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index a0e426e482b..d37f53ae5f5 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -32,7 +32,15 @@ in url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; name = "wpa_supplicant-nm-0.9.patch"; sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8"; - }) ]; + }) + # wpa_supplicant crashes when controlled through dbus (wicd/nm) + # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625 + (fetchurl { + url = "https://bugzilla.redhat.com/attachment.cgi?id=491018"; + name = "dbus-assertion-fix.patch"; + sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a"; + }) + ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 |