zbar: switch to GTK 3

This commit is contained in:
Jan Tojnar
2019-09-10 01:56:40 +02:00
parent 61fdd203d6
commit 021faed5ba
+8 -4
View File
@@ -7,7 +7,7 @@
, libX11 , libX11
, libv4l , libv4l
, qt5 , qt5
, gtk2 , gtk3
, xmlto , xmlto
, docbook_xsl , docbook_xsl
, autoreconfHook , autoreconfHook
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
dbus dbus
] ++ lib.optionals enableVideo [ ] ++ lib.optionals enableVideo [
libv4l libv4l
gtk2 gtk3
qt5.qtbase qt5.qtbase
qt5.qtx11extras qt5.qtx11extras
]; ];
@@ -56,15 +56,19 @@ stdenv.mkDerivation rec {
"--with-dbusconfdir=${placeholder "out"}/etc" "--with-dbusconfdir=${placeholder "out"}/etc"
] else [ ] else [
"--without-dbus" "--without-dbus"
]) ++ lib.optionals (!enableVideo) [ ]) ++ (if enableVideo then [
"--with-gtk=gtk3"
] else [
"--disable-video" "--disable-video"
"--without-gtk" "--without-gtk"
"--without-qt" "--without-qt"
]; ]);
dontWrapQtApps = true; dontWrapQtApps = true;
dontWrapGApps = true;
postFixup = lib.optionalString enableVideo '' postFixup = lib.optionalString enableVideo ''
wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
wrapQtApp "$out/bin/zbarcam-qt" wrapQtApp "$out/bin/zbarcam-qt"
''; '';