summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-03-22 07:06:25 +0100
committerlassulus <lassulus@lassul.us>2019-03-22 07:06:25 +0100
commit138cc0b8dc3fc4768f74b9b88fc21d1d3cd68f65 (patch)
tree0a59bca40b510dd472be24c70be76116b4055286
parent550faa1f64434951cd3949bc96a25012349f0090 (diff)
parent7f57b45d61a5ce784f663c0276cc24df6e19a4fb (diff)
Merge remote-tracking branch 'ni/master'
m---------submodules/nix-writers0
-rw-r--r--tv/5pkgs/simple/utsushi.nix5
2 files changed, 3 insertions, 2 deletions
diff --git a/submodules/nix-writers b/submodules/nix-writers
-Subproject fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a
+Subproject d856f05daff9cd726d1e798f1bb9a18eecbe2f5
diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix
index e61dd188f..55e8800a6 100644
--- a/tv/5pkgs/simple/utsushi.nix
+++ b/tv/5pkgs/simple/utsushi.nix
@@ -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";
};
}