about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-11-26 23:25:25 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-11-26 23:25:25 +0000
commit8c4574571dd7cdc61c7dcdd9ebef6597009fb155 (patch)
treed074eba0211164855c112da51f3fe94c8d23963b /pkgs
parent510ff785e7d13f3ca0e3be8bfed638992b218dcd (diff)
downloadnixlib-8c4574571dd7cdc61c7dcdd9ebef6597009fb155.tar
nixlib-8c4574571dd7cdc61c7dcdd9ebef6597009fb155.tar.gz
nixlib-8c4574571dd7cdc61c7dcdd9ebef6597009fb155.tar.bz2
nixlib-8c4574571dd7cdc61c7dcdd9ebef6597009fb155.tar.lz
nixlib-8c4574571dd7cdc61c7dcdd9ebef6597009fb155.tar.xz
nixlib-8c4574571dd7cdc61c7dcdd9ebef6597009fb155.tar.zst
nixlib-8c4574571dd7cdc61c7dcdd9ebef6597009fb155.zip
* 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
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/splashutils/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix
index 1fc8003b5b0a..3c1f0efb835e 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";
 }