3 files changed, 28 insertions, 6 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 31de45bb431a1..71eec996f289c 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -147,6 +147,15 @@
     stdenv = stdenv;
   };
 
+  swig = (import ../development/tools/misc/swig) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    perlSupport = true;
+    pythonSupport = true;
+    perl = perl;
+    python = python;
+  };
+
   gnumake = (import ../development/tools/build-managers/gnumake) {
     fetchurl = fetchurl;
     stdenv = stdenv;
@@ -175,6 +184,11 @@
     stdenv = stdenv;
   };
 
+  python = (import ../development/interpreters/python) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
   pcre = (import ../development/libraries/pcre) {
     fetchurl = fetchurl;
     stdenv = stdenv;
@@ -413,6 +427,13 @@
     stdenv = stdenv;
   };
 
+  perlBerkeleyDB = (import ../development/perl-modules/BerkeleyDB) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    perl = perl;
+    db4 = db4;
+  };
+
 
   ### SERVERS
 
@@ -477,6 +498,7 @@
     httpd = apacheHttpd;
     db4 = db4;
     expat = expat;
+    swig = swig;
   };
 
   pan = (import ../applications/networking/newsreaders/pan) {
diff --git a/pkgs/system/all-packages.nix b/pkgs/system/all-packages.nix
index de4b3977d837e..367ac1950349f 100644
--- a/pkgs/system/all-packages.nix
+++ b/pkgs/system/all-packages.nix
@@ -16,15 +16,15 @@
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
   # be used with care, since many Nix packages will not build properly
   # with it (e.g., because they require GNU Make).
-  stdenvNative = (import ../stdenv/native) {system = system};
-  stdenvNativePkgs = allPackages {system = system; stdenv = stdenvNative};
+  stdenvNative = (import ../stdenv/native) {system = system;};
+  stdenvNativePkgs = allPackages {system = system; stdenv = stdenvNative;};
 
   # The Nix build environment.
   stdenvNix = (import ../stdenv/nix) {
     bootStdenv = stdenvNative;
     pkgs = stdenvNativePkgs;
   };
-  stdenvNixPkgs = allPackages {system = system; stdenv = stdenvNix};
+  stdenvNixPkgs = allPackages {system = system; stdenv = stdenvNix;};
 
   # The Linux build environment consists of the Nix build environment
   # built against the GNU C Library.
@@ -33,14 +33,14 @@
     system = system;
     glibc = stdenvLinuxGlibc;
   };
-  stdenvLinuxBootPkgs = allPackages {system = system; stdenv = stdenvLinuxBoot};
+  stdenvLinuxBootPkgs = allPackages {system = system; stdenv = stdenvLinuxBoot;};
 
   stdenvLinux = (import ../stdenv/nix-linux) {
     bootStdenv = stdenvLinuxBoot;
     pkgs = stdenvLinuxBootPkgs;
     glibc = stdenvLinuxGlibc;
   };
-  stdenvLinuxPkgs = allPackages {system = system; stdenv = stdenvLinux};
+  stdenvLinuxPkgs = allPackages {system = system; stdenv = stdenvLinux;};
 
   # Select the right instantiation.
   body =
diff --git a/pkgs/system/i686-linux.nix b/pkgs/system/i686-linux.nix
index c35e5a27ed0a6..4ff2a8cda12ab 100644
--- a/pkgs/system/i686-linux.nix
+++ b/pkgs/system/i686-linux.nix
@@ -1 +1 @@
-(import ./all-packages.nix) {system = "i686-linux"}
+(import ./all-packages.nix) {system = "i686-linux";}