From 562cb3f460b7d564fe94315d412bc495101118b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Fri, 12 Apr 2013 01:58:38 +0200
Subject: [PATCH 1/2] Add Plymouth: WIP

---
 pkgs/os-specific/linux/plymouth/default.nix | 46 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 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
new file mode 100644
index 00000000000..b17441f3650
--- /dev/null
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, pango, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "plymouth-${version}";
+  version = "0.8.8";
+
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2";
+    sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v";
+  };
+
+  buildInputs = [
+    cairo gtk libdrm libpng pango pkgconfig
+  ];
+
+
+  configurePhase = ''
+    export DESTDIR=$out
+    ./configure -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
+  '';
+
+  postInstall = ''
+    cd $out/$out
+    mv bin/* $out/bin
+    mv sbin/* $out/sbin
+    rmdir bin
+    rmdir sbin
+    mv * $out/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.freedesktop.org/wiki/Software/Plymouth;
+    description = "A graphical boot animation";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e6acb7905b..9f790930614 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6165,6 +6165,8 @@ let
     config = config.pcmciaUtils.config or null;
   };
 
+  plymouth = callPackage ../os-specific/linux/plymouth { };
+
   pmount = callPackage ../os-specific/linux/pmount { };
 
   pmutils = callPackage ../os-specific/linux/pm-utils { };

From 34b7ddafa80856905103f9025ecdde9f70fe9f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Mon, 15 Apr 2013 20:15:47 +0200
Subject: [PATCH 2/2] 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(-)

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