summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2012-08-01 21:44:53 -0400
committerShea Levy <shea@shealevy.com>2012-08-01 21:44:53 -0400
commitec587dfc2596aa2c1e933c85016f1e29fe4ead16 (patch)
treeea7969e8abd8504587724d7c0f3c8440766669c7 /pkgs
parentfd330e9315c84f2ea9598d4fa2e6cc79a39cb1e3 (diff)
downloadnixlib-ec587dfc2596aa2c1e933c85016f1e29fe4ead16.tar
nixlib-ec587dfc2596aa2c1e933c85016f1e29fe4ead16.tar.gz
nixlib-ec587dfc2596aa2c1e933c85016f1e29fe4ead16.tar.bz2
nixlib-ec587dfc2596aa2c1e933c85016f1e29fe4ead16.tar.lz
nixlib-ec587dfc2596aa2c1e933c85016f1e29fe4ead16.tar.xz
nixlib-ec587dfc2596aa2c1e933c85016f1e29fe4ead16.tar.zst
nixlib-ec587dfc2596aa2c1e933c85016f1e29fe4ead16.zip
kernelPackages.splashUtils: Enable detecting if manually configured kernels have fbcondecor
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f040dd56d2a1..6ad835a9524a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5816,8 +5816,10 @@ let
       linuxHeaders = glibc.kernelHeaders;
     };
 
-    splashutils =
-      if kernel.features ? fbConDecor then pkgs.splashutils else null;
+    splashutils = let hasFbConDecor = if kernel ? features
+      then kernel.features ? fbConDecor
+      else kernel.config.isEnabled "FB_CON_DECOR";
+    in if hasFbConDecor then pkgs.splashutils else null;
 
     /* compiles but has to be integrated into the kernel somehow
       Let's have it uncommented and finish it..