diff options
| -rw-r--r-- | pkgs/os-specific/linux/splashutils/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 8 insertions, 10 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd9af84f4016..bd6d8162551e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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) { |