diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-18 11:07:56 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-18 11:07:56 +0200 |
| commit | f120248daff4f1db2dac63601cfebe9048898d57 (patch) | |
| tree | bfa7d2ddb925d8db4e82539f044cd83d1c554e6d /pkgs/tools/graphics | |
| parent | 4d6f65b81fca657a137954050874e8816c032882 (diff) | |
| parent | 41377252e53a78bd8903a4f3e0e35714e20f6147 (diff) | |
| download | nixlib-f120248daff4f1db2dac63601cfebe9048898d57.tar nixlib-f120248daff4f1db2dac63601cfebe9048898d57.tar.gz nixlib-f120248daff4f1db2dac63601cfebe9048898d57.tar.bz2 nixlib-f120248daff4f1db2dac63601cfebe9048898d57.tar.lz nixlib-f120248daff4f1db2dac63601cfebe9048898d57.tar.xz nixlib-f120248daff4f1db2dac63601cfebe9048898d57.tar.zst nixlib-f120248daff4f1db2dac63601cfebe9048898d57.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/gmic_krita_qt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix index 14d47dc30bd8..7ea73ab8db8d 100644 --- a/pkgs/tools/graphics/gmic_krita_qt/default.nix +++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng , curl, krita, qtbase, qttools , fetchgit }: diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index b3835394800d..503461018abb 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl -, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus +, libX11, libv4l, qt5, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus , enableVideo ? stdenv.isLinux, enableDbus ? stdenv.isLinux }: |