summary refs log tree commit diff
path: root/pkgs/development/libraries/aqbanking
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-04-27 17:41:34 +0200
committeraszlig <aszlig@nix.build>2018-04-27 18:34:59 +0200
commit3dba79e6898c78fde29908ad698a41420bd7c9d8 (patch)
tree32c6a9f1ad87c705c8713821e4d7aa5686c60744 /pkgs/development/libraries/aqbanking
parentcc909ff4dd02bcd7e632b7174d2599fa8f00dd7f (diff)
downloadnixpkgs-3dba79e6898c78fde29908ad698a41420bd7c9d8.tar
nixpkgs-3dba79e6898c78fde29908ad698a41420bd7c9d8.tar.gz
nixpkgs-3dba79e6898c78fde29908ad698a41420bd7c9d8.tar.bz2
nixpkgs-3dba79e6898c78fde29908ad698a41420bd7c9d8.tar.lz
nixpkgs-3dba79e6898c78fde29908ad698a41420bd7c9d8.tar.xz
nixpkgs-3dba79e6898c78fde29908ad698a41420bd7c9d8.tar.zst
nixpkgs-3dba79e6898c78fde29908ad698a41420bd7c9d8.zip
gwenhywfar: Support Gtk 2, Gtk 3 and Qt 5 GUIs
So far we used only the defaults, which are gtk2 and qt5. However
nowadays most applications have already switched to Qt 5 and Gtk 3, so
let's aim for that instead.

The reason Gtk 2 is still there is because GnuCash in nixpkgs is using
the Gtk 2 interface, so we can drop it as soon as a newer GnuCash has
landed in nixpkgs.

Right now the only package that depends on this is GnuCash (and
aqbanking of course), so I've tested this by not only building
gwenhywfar and aqbanking but also GnuCash. I did however not test
whether HBCI functionality works, only whether GnuCash starts up.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @goibhniu, @peti, @domenkozar
Diffstat (limited to 'pkgs/development/libraries/aqbanking')
-rw-r--r--pkgs/development/libraries/aqbanking/gwenhywfar.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 77a5a09da43..ae402f88415 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnutls, gtk2, libgcrypt, pkgconfig, gettext, qt4
+{ stdenv, fetchurl, gnutls, gtk2, gtk3, libgcrypt, pkgconfig, gettext, which, qt5
 
 , pluginSearchPaths ? [
     "/run/current-system/sw/lib/gwenhywfar/plugins"
@@ -21,6 +21,10 @@ in stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  preConfigure = ''
+    configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5")
+  '';
+
   postPatch = let
     isRelative = path: builtins.substring 0 1 path != "/";
     mkSearchPath = path: ''
@@ -44,11 +48,9 @@ in stdenv.mkDerivation rec {
       configure
   '';
 
-  nativeBuildInputs = [ pkgconfig gettext ];
-
-  buildInputs = [ gtk2 qt4 gnutls libgcrypt ];
+  nativeBuildInputs = [ pkgconfig gettext which ];
 
-  QTDIR = qt4;
+  buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls libgcrypt ];
 
   meta = with stdenv.lib; {
     description = "OS abstraction functions used by aqbanking and related tools";