diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-01-19 09:23:24 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-01-19 09:23:24 +0000 |
| commit | 652712b77ae16096e335bcfbbcb847cab052385a (patch) | |
| tree | b562b207bfb7f136af7020b536190ef010db49ae /pkgs/os-specific/linux/udisks/default.nix | |
| parent | ed221cf4cc874cf558384d6a09c2ec322eae6414 (diff) | |
| download | nixpkgs-652712b77ae16096e335bcfbbcb847cab052385a.tar nixpkgs-652712b77ae16096e335bcfbbcb847cab052385a.tar.gz nixpkgs-652712b77ae16096e335bcfbbcb847cab052385a.tar.bz2 nixpkgs-652712b77ae16096e335bcfbbcb847cab052385a.tar.lz nixpkgs-652712b77ae16096e335bcfbbcb847cab052385a.tar.xz nixpkgs-652712b77ae16096e335bcfbbcb847cab052385a.tar.zst nixpkgs-652712b77ae16096e335bcfbbcb847cab052385a.zip | |
udisks: Autoreconf properly.
svn path=/nixpkgs/trunk/; revision=31679
Diffstat (limited to 'pkgs/os-specific/linux/udisks/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/udisks/default.nix | 9 |
1 files changed, 6 insertions, 3 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 = { |