summary refs log tree commit diff
path: root/pkgs/applications/office/gnucash
diff options
context:
space:
mode:
authorKirill Boltaev <aske@fmap.me>2016-09-12 00:24:51 +0300
committerKirill Boltaev <aske@fmap.me>2016-09-12 18:26:06 +0300
commitbccd75094fd5108b3d834ad3a86e056eed3b0337 (patch)
tree8954184c0376ef2f8218b7df7049edde7ef6a49b /pkgs/applications/office/gnucash
parent30107249b1a5681771591cd65aa4f1c98f4cb023 (diff)
downloadnixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.gz
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.bz2
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.lz
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.xz
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.zst
nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.zip
treewide: explicitly specify gtk and related package versions
Diffstat (limited to 'pkgs/applications/office/gnucash')
-rw-r--r--pkgs/applications/office/gnucash/2.6.nix6
-rw-r--r--pkgs/applications/office/gnucash/default.nix4
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 5c87218e306f..ef824f57a354 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile
-, intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
+, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
 , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
 , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
 , pango, gdk_pixbuf
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant
     bzip2 isocodes
     # glib, gtk...
-    glib gtk goffice webkit
+    glib gtk2 goffice webkit
     # gnome...
     dconf gconf libgnomecanvas gsettings_desktop_schemas
     # financial
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   '';
 
   # The following settings fix failures in the test suite. It's not required otherwise.
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk pango gdk_pixbuf ];
+  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk2 pango gdk_pixbuf ];
   preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
   doCheck = true;
 
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 7ef77dc2562d..1eedf1f313b7 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx
+{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
 , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
 , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
 , libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml
+    pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
     libgnomeprint goffice enchant gettext intltool perl guile slibGuile
     swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
     perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar