[Nix-dev] gtkLibs error

[Pjotr Prins]

In the current checkout of nixpkgs I get the following error:

error: undefined variable `gtkLibs', in
`/export/users/local/wrk/data/org/nixpkgs-svn/pkgs/applications/graphics/gimp/plugins/default.nix'

I fixed it with the following, probably incorrect, patch:


Index: pkgs/applications/graphics/gimp/default.nix
===================================================================
--- pkgs/applications/graphics/gimp/default.nix	(revision 16529)
+++ pkgs/applications/graphics/gimp/default.nix	(working copy)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
+{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype, gtkLibs
 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
 , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
 }:
Index: pkgs/applications/graphics/gimp/plugins/default.nix
===================================================================
--- pkgs/applications/graphics/gimp/plugins/default.nix	(revision 16529)
+++ pkgs/applications/graphics/gimp/plugins/default.nix	(working copy)
@@ -3,7 +3,7 @@
 # preferences -> Folders -> Plug-ins
 # same applies for the scripts
 
-{ pkgs, gimp }:
+{ pkgs, gimp, gtkLibs }:
 let
   inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs;
   inherit (gtkLibs) glib;
Index: pkgs/top-level/all-packages.nix
===================================================================
--- pkgs/top-level/all-packages.nix	(revision 16529)
+++ pkgs/top-level/all-packages.nix	(working copy)
@@ -6376,9 +6376,9 @@
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libtiff libjpeg libpng libexif zlib perl perlXMLParser
       python pygtk gettext xlibs intltool babl gegl;
-    inherit (gnome) gtk libgtkhtml libart_lgpl;
+    inherit (gnome) gtk libgtkhtml libart_lgpl gtkLibs;
   };
-  gimpPlugins = import ../applications/graphics/gimp/plugins { inherit pkgs gimp; };
+  gimpPlugins = import ../applications/graphics/gimp/plugins { inherit pkgs gimp gtkLibs; };
 
   gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
     inherit pkgs;