summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-26 17:31:21 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-26 18:03:43 +0200
commit8a182718ca8d7696cd975a2ea5a552a9bc4c1b04 (patch)
treedac03a89b6da20d48e2f52336cddcea61da77c68 /pkgs/os-specific/linux
parentfc961af360d5618d712832097b08030b7cf9d932 (diff)
splashutils: Remove
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix3
-rw-r--r--pkgs/os-specific/linux/splashutils/default.nix36
2 files changed, 0 insertions, 39 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index da832359979b2..01a605aac3090 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -86,9 +86,6 @@ with stdenv.lib;
   ''}
   BCMA_HOST_PCI y
 
-  # Some settings to make sure that fbcondecor works - in particular,
-  # disable tileblitting and the drivers that need it.
-
   # Enable various FB devices.
   FB y
   FB_EFI y
diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix
deleted file mode 100644
index 86bdd7eee9ba2..0000000000000
--- a/pkgs/os-specific/linux/splashutils/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, zlib, libjpeg }:
-
-stdenv.mkDerivation {
-  name = "splashutils-1.5.4.3";
-
-  src = fetchurl {
-    url = http://dev.gentoo.org/~spock/projects/splashutils/current/splashutils-1.5.4.3.tar.bz2;
-    sha256 = "0vn0ifqp9a3bmprzx2yr82hgq8m2y5xv8qcifs2plz6p3lidagpg";
-  };
-
-  buildInputs = [ zlib libjpeg ];
-  
-  configureFlags = "--without-ttf --without-png --without-gpm --with-themedir=/etc/splash KLCC=gcc";
-
-  dontDisableStatic = true;
-
-  preConfigure = ''
-    configureFlags="$configureFlags --with-essential-prefix=$out"
-    substituteInPlace src/common.h \
-      --replace 'FBSPLASH_DIR"/sys"' '"/sys"' \
-      --replace 'FBSPLASH_DIR"/proc"' '"/proc"'
-    substituteInPlace src/Makefile.in \
-      --replace '-all-static' "" \
-      --replace '-static' ""
-  '';
-
-  CPP = "gcc -E";
-  CXXCPP = "g++ -E";
-  NIX_CFLAGS_COMPILE = "-fPIC";
-
-  passthru = {
-    helperName = "sbin/fbcondecor_helper";
-    controlName = "sbin/fbcondecor_ctl";
-    helperProcFile = "/proc/sys/kernel/fbcondecor";
-  };
-}