diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-01 16:36:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-01 16:36:07 +0000 |
| commit | 09b8d46dc94e30ff728fae23c492e9746ea913f0 (patch) | |
| tree | 0ec015b23a2b392f65a43c8f18a3eb961edbeb24 /pkgs/os-specific/linux/splashutils | |
| parent | bf010ace5575bb8ef0be8ea515dad33ca5b68b7c (diff) | |
| download | nixlib-09b8d46dc94e30ff728fae23c492e9746ea913f0.tar nixlib-09b8d46dc94e30ff728fae23c492e9746ea913f0.tar.gz nixlib-09b8d46dc94e30ff728fae23c492e9746ea913f0.tar.bz2 nixlib-09b8d46dc94e30ff728fae23c492e9746ea913f0.tar.lz nixlib-09b8d46dc94e30ff728fae23c492e9746ea913f0.tar.xz nixlib-09b8d46dc94e30ff728fae23c492e9746ea913f0.tar.zst nixlib-09b8d46dc94e30ff728fae23c492e9746ea913f0.zip | |
* splashutils: use Glibc instead of klibc.
svn path=/nixpkgs/trunk/; revision=22086
Diffstat (limited to 'pkgs/os-specific/linux/splashutils')
| -rw-r--r-- | pkgs/os-specific/linux/splashutils/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix index 35cbe28bf5d4..86bdd7eee9ba 100644 --- a/pkgs/os-specific/linux/splashutils/default.nix +++ b/pkgs/os-specific/linux/splashutils/default.nix @@ -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"; |