public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plymouth: hacky fix build (automake-related)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/os-specific/linux/plymouth/default.nix
View File

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

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

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