zbar: drop pygtk support

It is deprecated and we do not actually use it anywhere
This commit is contained in:
Jan Tojnar
2019-09-10 01:56:39 +02:00
parent e1d5779154
commit da135c2704
+4 -13
View File
@@ -3,7 +3,6 @@
, fetchFromGitHub , fetchFromGitHub
, imagemagickBig , imagemagickBig
, pkgconfig , pkgconfig
, python2Packages
, perl , perl
, libX11 , libX11
, libv4l , libv4l
@@ -17,14 +16,11 @@
, enableDbus ? stdenv.isLinux , enableDbus ? stdenv.isLinux
}: }:
let
inherit (python2Packages) pygtk python;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zbar"; pname = "zbar";
version = "0.23"; version = "0.23";
outputs = [ "out" "py" "lib" "dev" "doc" "man" ]; outputs = [ "out" "lib" "dev" "doc" "man" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mchehab"; owner = "mchehab";
@@ -42,8 +38,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
imagemagickBig imagemagickBig
python
pygtk
perl perl
libX11 libX11
] ++ lib.optionals enableDbus [ ] ++ lib.optionals enableDbus [
@@ -55,7 +49,9 @@ stdenv.mkDerivation rec {
qt5.qtx11extras qt5.qtx11extras
]; ];
configureFlags = (if enableDbus then [ configureFlags = [
"--without-python"
] ++ (if enableDbus then [
"--with-dbusconfdir=${placeholder "out"}/etc" "--with-dbusconfdir=${placeholder "out"}/etc"
] else [ ] else [
"--without-dbus" "--without-dbus"
@@ -65,11 +61,6 @@ stdenv.mkDerivation rec {
"--without-qt" "--without-qt"
]; ];
makeFlags = [
"pyexecdir=${placeholder "py"}/${python.sitePackages}"
"pythondir=${placeholder "py"}/${python.sitePackages}"
];
meta = with lib; { meta = with lib; {
description = "Bar code reader"; description = "Bar code reader";
longDescription = '' longDescription = ''