From 34b7ddafa80856905103f9025ecdde9f70fe9f08 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Mon, 15 Apr 2013 20:15:47 +0200
Subject: Plymouth: works quite well with the X11 renderer and from a VT

I haven't figured out how to get it into the initrd correctly yet.
---
 pkgs/os-specific/linux/plymouth/default.nix | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'pkgs/os-specific/linux/plymouth')

diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index b17441f3650..bf3da195467 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, pango, pkgconfig }:
+{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, makeWrapper, pango, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "plymouth-${version}";
@@ -9,32 +9,42 @@ stdenv.mkDerivation rec {
     sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v";
   };
 
-  buildInputs = [
-    cairo gtk libdrm libpng pango pkgconfig
-  ];
-
+  buildInputs = [ cairo gtk libdrm libpng makeWrapper pango pkgconfig ];
 
   configurePhase = ''
     export DESTDIR=$out
-    ./configure -sbindir=$out/sbin \
+    ./configure \
+      -bindir=$out/bin \
+      -sbindir=$out/sbin \
       --prefix=$out \
       --exec-prefix=$out \
       --libdir=$out/lib \
       --libexecdir=$out/lib \
-      --with-system-root-install \
       --enable-tracing \
-      --with-rhgb-compat-link \
       --sysconfdir=/etc \
-      --localstatedir=/var
+      --localstatedir=/var \
+      --without-system-root-install \
+      --enable-gtk
   '';
+#      --enable-systemd-integration
+#      -datadir=/share \
+#      --with-rhgb-compat-link \
+
+  preInstall = "mkdir -p $out/bin $out/sbin";
 
   postInstall = ''
     cd $out/$out
     mv bin/* $out/bin
     mv sbin/* $out/sbin
+
     rmdir bin
     rmdir sbin
     mv * $out/
+    sed -e "s#> $output##" \
+      -e "s#> /dev/stderr##" \
+      -i $out/lib/plymouth/plymouth-populate-initrd
+    wrapProgram $out/lib/plymouth/plymouth-populate-initrd \
+      --set PATH $PATH:$out/bin:$out/sbin
   '';
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1