Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2019-03-22 07:06:25 +01:00
commit 138cc0b8dc
2 changed files with 4 additions and 3 deletions
submodules
tv/5pkgs/simple

@ -1 +1 @@
Subproject commit fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a1
Subproject commit d856f05daff9cd726d1e798f1bb9a18eecbe2f50

View file

@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz";
sha256 = "12mzq3wc8gzdma84pjs5gb0gp8mga13wax5g7vjfrzq8pjyqrnmw";
sha256 = "1gmiimwkcyzbkfr25vzqczjhgh90fgxd96agbnkpf9gah1mpd6qj";
};
preConfigure = ''
@ -172,6 +172,7 @@ stdenv.mkDerivation rec {
"--with-boost=${boost}"
"--with-magick"
"--with-magick-pp"
"--with-udev-confdir=$(out)/etc/udev"
]
++ stdenv.lib.optionals guiSupport [
"--with-gtkmm"
@ -202,6 +203,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.tv ];
platforms = stdenv.lib.platforms.linux;
version = "3.48.0";
version = "3.54.0";
};
}