JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* splashutils: use Glibc instead of klibc.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22086
This commit is contained in:
Eelco Dolstra 2010-06-01 16:36:07 +00:00
parent bf010ace55
commit 09b8d46dc9
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/splashutils/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, klibc, zlib, libjpeg}:
{ stdenv, fetchurl, zlib, libjpeg }:
stdenv.mkDerivation {
name = "splashutils-1.5.4.3";
@ -8,9 +8,9 @@ stdenv.mkDerivation {
sha256 = "0vn0ifqp9a3bmprzx2yr82hgq8m2y5xv8qcifs2plz6p3lidagpg";
};
buildInputs = [klibc zlib libjpeg];
buildInputs = [ zlib libjpeg ];
configureFlags = "--without-ttf --without-png --without-gpm --with-themedir=/etc/splash";
configureFlags = "--without-ttf --without-png --without-gpm --with-themedir=/etc/splash KLCC=gcc";
dontDisableStatic = true;
@ -19,10 +19,14 @@ stdenv.mkDerivation {
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";

8
pkgs/top-level/all-packages.nix
View File

@ -4566,10 +4566,6 @@ let
libtool = libtool_1_5;
};
libjpegStatic = lowPrio (appendToName "static" (libjpeg.override {
stdenv = enableStaticLibraries stdenv;
}));
libksba = import ../development/libraries/libksba {
inherit fetchurl stdenv libgpgerror;
};
@ -6755,9 +6751,7 @@ let
};
splashutils = import ../os-specific/linux/splashutils/default.nix {
inherit fetchurl stdenv klibc;
zlib = zlibStatic;
libjpeg = libjpegStatic;
inherit fetchurl stdenv zlib libjpeg;
};
statifier = builderDefsPackage (import ../os-specific/linux/statifier) {