plymouth: hacky fix build (automake-related)

This commit is contained in:
Vladimír Čunát 2015-03-04 22:02:09 +01:00
parent 856d1ff27f
commit 7e042659b7
2 changed files with 21 additions and 24 deletions

View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, autoconf, automake, cairo, docbook_xsl, gtk
, libdrm, libpng , libtool, libxslt, makeWrapper, pango, pkgconfig
, udev
{ stdenv, fetchurl, autoreconfHook, cairo, docbook_xsl, gtk
, libdrm, libpng, libxslt, makeWrapper, pango, pkgconfig, udev
}:
stdenv.mkDerivation rec {
@ -13,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
autoconf automake cairo docbook_xsl gtk libdrm libpng libtool
autoreconfHook cairo docbook_xsl gtk libdrm libpng
libxslt makeWrapper pango pkgconfig udev
];
@ -22,23 +21,23 @@ stdenv.mkDerivation rec {
-i configure.ac
'';
configurePhase = ''
./configure \
--prefix=$out \
-bindir=$out/bin \
-sbindir=$out/sbin \
--exec-prefix=$out \
--libdir=$out/lib \
--libexecdir=$out/lib \
--sysconfdir=$out/etc \
--localstatedir=/var \
--with-log-viewer \
--without-system-root-install \
--without-rhgb-compat-link \
--enable-tracing \
--enable-systemd-integration \
--enable-pango \
--enable-gtk
postPatch = ''
configureFlags="
--prefix=$out
--bindir=$out/bin
--sbindir=$out/sbin
--exec-prefix=$out
--libdir=$out/lib
--libexecdir=$out/lib
--sysconfdir=$out/etc
--localstatedir=/var
--with-log-viewer
--without-system-root-install
--without-rhgb-compat-link
--enable-tracing
--enable-systemd-integration
--enable-pango
--enable-gtk"
'';
meta = with stdenv.lib; {

View File

@ -9129,9 +9129,7 @@ let
config = config.pcmciaUtils.config or null;
};
plymouth = callPackage ../os-specific/linux/plymouth {
automake = automake113x;
};
plymouth = callPackage ../os-specific/linux/plymouth { };
pmount = callPackage ../os-specific/linux/pmount { };