From 8c4574571dd7cdc61c7dcdd9ebef6597009fb155 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 26 Nov 2006 23:25:25 +0000 Subject: [PATCH] * Build with fbsplash support, and put the control FIFO (which we don't use yet, the daemon mode seems broken) in a more sensible place. svn path=/nixpkgs/trunk/; revision=7139 --- pkgs/os-specific/linux/splashutils/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix index 1fc8003b5b0..3c1f0efb835 100644 --- a/pkgs/os-specific/linux/splashutils/default.nix +++ b/pkgs/os-specific/linux/splashutils/default.nix @@ -14,12 +14,9 @@ stdenv.mkDerivation { dontAddPrefix = 1; configureScript = "sh ./configure"; - configureFlags = "--without-ttf --without-png --without-fbsplash"; + configureFlags = "--without-ttf --without-png --with-fifo=/var/run/splash_fifo"; makeFlags = "QUIET=false"; - #NIX_CFLAGS_COMPILE = "-Iobjs/jpeglib -Ilibs/jpeg-6b -Ilibs/freetype-2.1.9/include -Ilibs/libpng-1.2.8 -Ilibs/zlib-1.2.3"; - #NIX_CFLAGS_LINK = "-Lobjs/jpeglib -Lobjs/freetype2/.libs -Llibs/zlib-1.2.3 -Llibs/libpng-1.2.8"; - installPhase = "ensureDir $out/bin; cp objs/splash_helper objs/splash_util objs/splash_util.static $out/bin"; }