colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zbar: switch to GTK 3

Browse Source
This commit is contained in:
Jan Tojnar 2019-09-10 01:05:55 +02:00
parent 61fdd203d6
commit 021faed5ba
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/graphics/zbar/default.nix
View File

@ -7,7 +7,7 @@
, libX11
, libv4l
, qt5
, gtk2
, gtk3
, xmlto
, docbook_xsl
, autoreconfHook
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
dbus
] ++ lib.optionals enableVideo [
libv4l
gtk2
gtk3
qt5.qtbase
qt5.qtx11extras
];
@ -56,15 +56,19 @@ stdenv.mkDerivation rec {
"--with-dbusconfdir=${placeholder "out"}/etc"
] else [
"--without-dbus"
]) ++ lib.optionals (!enableVideo) [
]) ++ (if enableVideo then [
"--with-gtk=gtk3"
] else [
"--disable-video"
"--without-gtk"
"--without-qt"
];
]);
dontWrapQtApps = true;
dontWrapGApps = true;
postFixup = lib.optionalString enableVideo ''
wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
wrapQtApp "$out/bin/zbarcam-qt"
'';