mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

udisks: Autoreconf properly.

Browse source 
svn path=/nixpkgs/trunk/; revision=31679
This commit is contained in:
Ludovic Courtès 2012-01-19 09:23:24 +00:00
parent ed221cf4cc
commit 652712b77a
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/os-specific/linux/udisks/default.nix
View file

@ -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 = {

4
pkgs/top-level/all-packages.nix
View file

@ -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;