diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 00:35:05 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 01:56:39 +0200 |
commit | da135c2704e405e7e576a4e394027043d9781529 (patch) | |
tree | e499efb0a2e9f7749e544a50afb4aec4efade8b2 /pkgs/tools/graphics | |
parent | e1d57791548dc5330d20420ffa57461f1a612ed8 (diff) |
zbar: drop pygtk support
It is deprecated and we do not actually use it anywhere
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 116f32a701b..74503862785 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , imagemagickBig , pkgconfig -, python2Packages , perl , libX11 , libv4l @@ -17,14 +16,11 @@ , enableDbus ? stdenv.isLinux }: -let - inherit (python2Packages) pygtk python; -in stdenv.mkDerivation rec { pname = "zbar"; version = "0.23"; - outputs = [ "out" "py" "lib" "dev" "doc" "man" ]; + outputs = [ "out" "lib" "dev" "doc" "man" ]; src = fetchFromGitHub { owner = "mchehab"; @@ -42,8 +38,6 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig - python - pygtk perl libX11 ] ++ lib.optionals enableDbus [ @@ -55,7 +49,9 @@ stdenv.mkDerivation rec { qt5.qtx11extras ]; - configureFlags = (if enableDbus then [ + configureFlags = [ + "--without-python" + ] ++ (if enableDbus then [ "--with-dbusconfdir=${placeholder "out"}/etc" ] else [ "--without-dbus" @@ -65,11 +61,6 @@ stdenv.mkDerivation rec { "--without-qt" ]; - makeFlags = [ - "pyexecdir=${placeholder "py"}/${python.sitePackages}" - "pythondir=${placeholder "py"}/${python.sitePackages}" - ]; - meta = with lib; { description = "Bar code reader"; longDescription = '' |