summary refs log tree commit diff
path: root/pkgs/system/all-packages-generic.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2004-04-02 15:36:14 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2004-04-02 15:36:14 +0000
commit8776ba127c0b63cba6a5b8015154909e5aa3167d (patch)
treed3ef86b7c17cec48e924a7f0d5d2735822168e3b /pkgs/system/all-packages-generic.nix
parentde759967c88370fcd8e7f12832a63bd2ee7b8f9e (diff)
downloadnixpkgs-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar
nixpkgs-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.gz
nixpkgs-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.bz2
nixpkgs-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.lz
nixpkgs-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.xz
nixpkgs-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.zst
nixpkgs-8776ba127c0b63cba6a5b8015154909e5aa3167d.zip
* Updated some more packages. However, bittorrent and vlc don't work
  right now because wxGTK is broken (it depends on internal symbols in
  GTK which where made private in GTK 2.4).

svn path=/nixpkgs/trunk/; revision=907
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
-rw-r--r--pkgs/system/all-packages-generic.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 8ce50c8e1b3..1da3a33366a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -479,11 +479,7 @@ rec {
   };
 
   wxGTK = (import ../development/libraries/wxGTK) {
-    inherit fetchurl stdenv;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gtk = gtk;
+    inherit fetchurl stdenv pkgconfig gtk;
   };
 
   gnet = (import ../development/libraries/gnet) {
@@ -605,7 +601,7 @@ rec {
   };
 
   wxPython = (import ../development/python-modules/wxPython) {
-    inherit fetchurl stdenv wxGTK python;
+    inherit fetchurl stdenv pkgconfig wxGTK python;
   };