From 6e21246dc471a01fe8e8107292b5067234d20595 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 6 Jul 2016 22:53:25 +0300 Subject: plymouth: 0.9.0 -> 0.9.2 Use system-wide directories for various resources. --- pkgs/os-specific/linux/plymouth/default.nix | 40 +++++++++++++++++++---------- 1 file changed, 27 insertions(+), 13 deletions(-) (limited to 'pkgs/os-specific/linux/plymouth/default.nix') diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 00d330ca955..b1b1a4649ba 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, autoreconfHook, cairo, docbook_xsl, gtk -, libdrm, libpng, libxslt, makeWrapper, pango, pkgconfig, udev +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxslt, docbook_xsl +, gtk3, udev, systemd }: stdenv.mkDerivation rec { name = "plymouth-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2"; - sha256 = "0kfdwv179brg390ma003pmdqfvqlbybqiyp9fxrxx0wa19sjxqnk"; + sha256 = "0zympsgy5bbfl2ag5nc1jxlshpx8r1s1yyjisanpx76g88hfh31g"; }; - buildInputs = [ - autoreconfHook cairo docbook_xsl gtk libdrm libpng - libxslt makeWrapper pango pkgconfig udev + nativeBuildInputs = [ + autoreconfHook pkgconfig libxslt docbook_xsl ]; - prePatch = '' - sed -e "s#\$(\$PKG_CONFIG --variable=systemdsystemunitdir systemd)#$out/etc/systemd/system#g" \ - -i configure.ac - ''; + buildInputs = [ + gtk3 udev systemd + ]; postPatch = '' + sed -i \ + -e "s#\$(\$PKG_CONFIG --variable=systemdsystemunitdir systemd)#$out/etc/systemd/system#g" \ + -e "s#plymouthplugindir=.*#plymouthplugindir=/etc/plymouth/plugins/#" \ + -e "s#plymouththemedir=.*#plymouththemedir=/etc/plymouth/themes#" \ + -e "s#plymouthpolicydir=.*#plymouthpolicydir=/etc/plymouth/#" \ + configure.ac + configureFlags=" --prefix=$out --bindir=$out/bin @@ -29,15 +34,24 @@ stdenv.mkDerivation rec { --exec-prefix=$out --libdir=$out/lib --libexecdir=$out/lib - --sysconfdir=$out/etc + --sysconfdir=/etc --localstatedir=/var - --with-log-viewer + --with-logo=/etc/plymouth/logo.png + --with-background-color=0x000000 + --with-background-start-color-stop=0x000000 + --with-background-end-color-stop=0x000000 + --with-release-file=/etc/os-release --without-system-root-install --without-rhgb-compat-link --enable-tracing --enable-systemd-integration --enable-pango + --enable-gdm-transition --enable-gtk" + + installFlags=" + plymouthd_defaultsdir=$out/share/plymouth + plymouthd_confdir=$out/etc/plymouth" ''; meta = with stdenv.lib; { -- cgit 1.4.1