diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-10 16:09:53 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-10 16:09:53 +0000 |
commit | 0283118633be409958442a4e062148de54a79ae8 (patch) | |
tree | c8040934a4b8f3cdef260f9785765d7f18e88579 /pkgs/os-specific/linux | |
parent | 2813fb46ad7f435722346f379995a328b6ab1613 (diff) | |
download | nixlib-0283118633be409958442a4e062148de54a79ae8.tar nixlib-0283118633be409958442a4e062148de54a79ae8.tar.gz nixlib-0283118633be409958442a4e062148de54a79ae8.tar.bz2 nixlib-0283118633be409958442a4e062148de54a79ae8.tar.lz nixlib-0283118633be409958442a4e062148de54a79ae8.tar.xz nixlib-0283118633be409958442a4e062148de54a79ae8.tar.zst nixlib-0283118633be409958442a4e062148de54a79ae8.zip |
* splashutils 1.5.4.1, needed for kernels that have the new
fbcondecor patch. splashutils 1.3 is retained for kernels with the fbsplash patch. svn path=/nixpkgs/trunk/; revision=12029
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/splashutils/1.3.nix (renamed from pkgs/os-specific/linux/splashutils/default.nix) | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/splashutils/1.5.nix | 32 |
2 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/1.3.nix index 7af2f882f958..157690805f3c 100644 --- a/pkgs/os-specific/linux/splashutils/default.nix +++ b/pkgs/os-specific/linux/splashutils/1.3.nix @@ -26,4 +26,10 @@ stdenv.mkDerivation { #makeFlags = "QUIET=false; installPhase = "ensureDir $out/bin; cp objs/splash_helper objs/splash_util objs/splash_util.static $out/bin"; + + passthru = { + helperName = "bin/splash_helper"; + controlName = "bin/splash_util"; + helperProcFile = "/proc/sys/kernel/fbsplash"; + }; } diff --git a/pkgs/os-specific/linux/splashutils/1.5.nix b/pkgs/os-specific/linux/splashutils/1.5.nix new file mode 100644 index 000000000000..7f0bce7dff95 --- /dev/null +++ b/pkgs/os-specific/linux/splashutils/1.5.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, klibc, zlib, libjpeg}: + +stdenv.mkDerivation { + name = "splashutils-1.5.4.1"; + + src = fetchurl { + url = http://download.berlios.de/fbsplash/splashutils-1.5.4.1.tar.bz2; + sha256 = "0pwv9l6a042hhcwpi4kqdzjg7d1mrlix0fvgqqzqh93mc54z9lf7"; + }; + + buildInputs = [klibc zlib libjpeg]; + + dontAddPrefix = 1; + + configureFlags = "--without-ttf --without-png --without-gpm --with-themedir=/etc/splash"; + + preConfigure = '' + configureFlags="$configureFlags --with-essential-prefix=$out --with-libdir=/" + substituteInPlace src/common.h \ + --replace 'FBSPLASH_DIR"/sys"' '"/sys"' \ + --replace 'FBSPLASH_DIR"/proc"' '"/proc"' + ''; + + CPP = "gcc -E"; + CXXCPP = "g++ -E"; + + passthru = { + helperName = "sbin/fbcondecor_helper"; + controlName = "sbin/fbcondecor_ctl"; + helperProcFile = "/proc/sys/kernel/fbcondecor"; + }; +} |