Merge remote-tracking branch 'tv/master'
This commit is contained in:
commit
72fb826ccb
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz";
|
url = "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz";
|
||||||
sha256 = "12mzq3wc8gzdma84pjs5gb0gp8mga13wax5g7vjfrzq8pjyqrnmw";
|
sha256 = "1gmiimwkcyzbkfr25vzqczjhgh90fgxd96agbnkpf9gah1mpd6qj";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
@ -172,6 +172,7 @@ stdenv.mkDerivation rec {
|
|||||||
"--with-boost=${boost}"
|
"--with-boost=${boost}"
|
||||||
"--with-magick"
|
"--with-magick"
|
||||||
"--with-magick-pp"
|
"--with-magick-pp"
|
||||||
|
"--with-udev-confdir=$(out)/etc/udev"
|
||||||
]
|
]
|
||||||
++ stdenv.lib.optionals guiSupport [
|
++ stdenv.lib.optionals guiSupport [
|
||||||
"--with-gtkmm"
|
"--with-gtkmm"
|
||||||
@ -202,6 +203,6 @@ stdenv.mkDerivation rec {
|
|||||||
license = stdenv.lib.licenses.gpl3;
|
license = stdenv.lib.licenses.gpl3;
|
||||||
maintainers = [ stdenv.lib.maintainers.tv ];
|
maintainers = [ stdenv.lib.maintainers.tv ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
version = "3.48.0";
|
version = "3.54.0";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user