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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-06-18 11:07:56 +02:00
parent 4d6f65b81f 41377252e5
commit f120248daf
928 changed files with 2418 additions and 2149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/gmic_krita_qt/default.nix
+1 -1
View File
@@ -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 }:
pkgs/tools/graphics/zbar/default.nix
+1 -1
View File
@@ -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
}: