diff options
| -rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
2 files changed, 14 insertions, 16 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index b9532510411..9402fad2287 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, gettext, freetype, zlib , libungif, libpng, libjpeg, libtiff, libxml2 +, withX11 ? false , libX11 ? null, lib, xproto ? null, libXt ? null }: let version = "20090408"; name = "fontforge-${version}"; - in +in stdenv.mkDerivation { inherit name; @@ -16,7 +17,7 @@ stdenv.mkDerivation { sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4"; }; - configureFlags = if libX11 != null then "--with-gui=gdraw" else ""; + configureFlags = lib.optionalString withX11 "--with-gui=gdraw"; preConfigure = '' unpackFile ${freetype.src} @@ -30,9 +31,6 @@ stdenv.mkDerivation { ''; buildInputs = - [gettext freetype zlib libungif libpng libjpeg libtiff libxml2] - ++ lib.optional (libX11 != null) libX11 - ++ lib.optional (xproto != null) xproto - ++ lib.optional (libXt != null) libXt - ; + [ gettext freetype zlib libungif libpng libjpeg libtiff libxml2 ] + ++ lib.optionals withX11 [ libX11 xproto libXt ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cdabe0bc4f..01daf8f0ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -96,12 +96,11 @@ let __overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig; pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides - pkgsOverriden = pkgsFun __overrides; # the overriden, final packages - pkgs = pkgsOverriden // helperFunctions; + pkgs = pkgsFun __overrides; # the overriden, final packages # The package compositions. Yes, this isn't properly indented. - pkgsFun = __overrides: with helperFunctions; rec { + pkgsFun = __overrides: with helperFunctions; helperFunctions // rec { # Override system. This is useful to build i686 packages on x86_64-linux. forceSystem = system: (import ./all-packages.nix) { @@ -761,6 +760,7 @@ let inherit fetchurl stdenv gettext freetype zlib libungif libpng libjpeg libtiff libxml2 lib; inherit (xlibs) libX11 xproto libXt; + withX11 = true; }; dos2unix = import ../tools/text/dos2unix { @@ -3584,11 +3584,11 @@ let }; apr = makeOverridable (import ../development/libraries/apr) { - inherit (pkgsOverriden) fetchurl stdenv; + inherit fetchurl stdenv; }; aprutil = makeOverridable (import ../development/libraries/apr-util) { - inherit (pkgsOverriden) fetchurl stdenv apr expat db4; + inherit fetchurl stdenv apr expat db4; bdbSupport = true; }; @@ -5900,7 +5900,7 @@ let }; apacheHttpd = makeOverridable (import ../servers/http/apache-httpd) { - inherit (pkgsOverriden) fetchurl stdenv perl openssl zlib apr aprutil pcre; + inherit fetchurl stdenv perl openssl zlib apr aprutil pcre; sslSupport = true; }; @@ -5987,7 +5987,7 @@ let }; mod_python = makeOverridable (import ../servers/http/apache-modules/mod_python) { - inherit (pkgsOverriden) fetchurl stdenv apacheHttpd python; + inherit fetchurl stdenv apacheHttpd python; }; mpd = import ../servers/mpd { @@ -8833,7 +8833,7 @@ let }; subversion = makeOverridable (import ../applications/version-management/subversion/default.nix) { - inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite; + inherit fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite; neon = neon029; bdbSupport = getConfig ["subversion" "bdbSupport"] true; httpServer = getConfig ["subversion" "httpServer"] false; @@ -8843,7 +8843,7 @@ let perlBindings = getConfig ["subversion" "perlBindings"] false; javahlBindings = supportsJDK && getConfig ["subversion" "javahlBindings"] false; compressionSupport = getConfig ["subversion" "compressionSupport"] true; - httpd = pkgsOverriden.apacheHttpd; + httpd = apacheHttpd; }; svk = perlPackages.SVK; |