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/top-level | |
| 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/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e1c78e866ab..e8869a160e09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4896,7 +4896,18 @@ let pkgs = rec { inherit stdenv klibc; }; - splashutils = import ../os-specific/linux/splashutils { + splashutils = + if kernel.features ? fbSplash then splashutils_13 else + if kernel.features ? fbConDecor then splashutils_15 else + null; + + splashutils_13 = import ../os-specific/linux/splashutils/1.3.nix { + inherit fetchurl stdenv klibc; + zlib = zlibStatic; + libjpeg = libjpegStatic; + }; + + splashutils_15 = import ../os-specific/linux/splashutils/1.5.nix { inherit fetchurl stdenv klibc; zlib = zlibStatic; libjpeg = libjpegStatic; |