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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 937a79e73b7..51b5fcc8144 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6127,7 +6127,9 @@ let udev173 = callPackage ../os-specific/linux/udev/173.nix { }; udev = pkgs.udev173; - udisks = callPackage ../os-specific/linux/udisks { }; + udisks = callPackage ../os-specific/linux/udisks { + inherit (gnome) gtkdoc; + }; uml = import ../os-specific/linux/kernel/linux-2.6.29.nix { inherit fetchurl stdenv perl mktemp module_init_tools;