suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

* Drop pkgsOverriden.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22823
This commit is contained in:
Eelco Dolstra 2010-07-30 12:10:24 +00:00
parent 3386a0e63d
commit ee4fe6ea84
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/misc/fontforge/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchurl, gettext, freetype, zlib { stdenv, fetchurl, gettext, freetype, zlib
, libungif, libpng, libjpeg, libtiff, libxml2 , libungif, libpng, libjpeg, libtiff, libxml2
, withX11 ? false
, libX11 ? null, lib, xproto ? null, libXt ? null , libX11 ? null, lib, xproto ? null, libXt ? null
}: }:
let let
version = "20090408"; version = "20090408";
name = "fontforge-${version}"; name = "fontforge-${version}";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name; inherit name;
@ -16,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4"; sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4";
}; };
configureFlags = if libX11 != null then "--with-gui=gdraw" else ""; configureFlags = lib.optionalString withX11 "--with-gui=gdraw";
preConfigure = '' preConfigure = ''
unpackFile ${freetype.src} unpackFile ${freetype.src}
@ -30,9 +31,6 @@ stdenv.mkDerivation {
''; '';
buildInputs = buildInputs =
[gettext freetype zlib libungif libpng libjpeg libtiff libxml2] [ gettext freetype zlib libungif libpng libjpeg libtiff libxml2 ]
++ lib.optional (libX11 != null) libX11 ++ lib.optionals withX11 [ libX11 xproto libXt ];
++ lib.optional (xproto != null) xproto
++ lib.optional (libXt != null) libXt
;
} }

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

@ -96,12 +96,11 @@ let
__overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig; __overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig;
pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides
pkgsOverriden = pkgsFun __overrides; # the overriden, final packages pkgs = pkgsFun __overrides; # the overriden, final packages
pkgs = pkgsOverriden // helperFunctions;
# The package compositions. Yes, this isn't properly indented. # 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. # Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: (import ./all-packages.nix) { forceSystem = system: (import ./all-packages.nix) {
@ -761,6 +760,7 @@ let
inherit fetchurl stdenv gettext freetype zlib inherit fetchurl stdenv gettext freetype zlib
libungif libpng libjpeg libtiff libxml2 lib; libungif libpng libjpeg libtiff libxml2 lib;
inherit (xlibs) libX11 xproto libXt; inherit (xlibs) libX11 xproto libXt;
withX11 = true;
}; };
dos2unix = import ../tools/text/dos2unix { dos2unix = import ../tools/text/dos2unix {
@ -3584,11 +3584,11 @@ let
}; };
apr = makeOverridable (import ../development/libraries/apr) { apr = makeOverridable (import ../development/libraries/apr) {
inherit (pkgsOverriden) fetchurl stdenv; inherit fetchurl stdenv;
}; };
aprutil = makeOverridable (import ../development/libraries/apr-util) { aprutil = makeOverridable (import ../development/libraries/apr-util) {
inherit (pkgsOverriden) fetchurl stdenv apr expat db4; inherit fetchurl stdenv apr expat db4;
bdbSupport = true; bdbSupport = true;
}; };
@ -5900,7 +5900,7 @@ let
}; };
apacheHttpd = makeOverridable (import ../servers/http/apache-httpd) { 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; sslSupport = true;
}; };
@ -5987,7 +5987,7 @@ let
}; };
mod_python = makeOverridable (import ../servers/http/apache-modules/mod_python) { 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 { mpd = import ../servers/mpd {
@ -8833,7 +8833,7 @@ let
}; };
subversion = makeOverridable (import ../applications/version-management/subversion/default.nix) { 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; neon = neon029;
bdbSupport = getConfig ["subversion" "bdbSupport"] true; bdbSupport = getConfig ["subversion" "bdbSupport"] true;
httpServer = getConfig ["subversion" "httpServer"] false; httpServer = getConfig ["subversion" "httpServer"] false;
@ -8843,7 +8843,7 @@ let
perlBindings = getConfig ["subversion" "perlBindings"] false; perlBindings = getConfig ["subversion" "perlBindings"] false;
javahlBindings = supportsJDK && getConfig ["subversion" "javahlBindings"] false; javahlBindings = supportsJDK && getConfig ["subversion" "javahlBindings"] false;
compressionSupport = getConfig ["subversion" "compressionSupport"] true; compressionSupport = getConfig ["subversion" "compressionSupport"] true;
httpd = pkgsOverriden.apacheHttpd; httpd = apacheHttpd;
}; };
svk = perlPackages.SVK; svk = perlPackages.SVK;