* splashutils: use Glibc instead of klibc.
svn path=/nixpkgs/trunk/; revision=22086
This commit is contained in:
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user