diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-19 21:57:18 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-20 04:41:11 +0200 |
commit | 8131ca52d18e71c29ae508fa604ff7699f422ef1 (patch) | |
tree | 29a74ee4dfffaa9ed5e302c56909722af0aff9ac /pkgs/applications/graphics/simple-scan | |
parent | 46df28d37162afb71ad91cf6c3fcf14a5cffb99f (diff) | |
download | nixpkgs-8131ca52d18e71c29ae508fa604ff7699f422ef1.tar nixpkgs-8131ca52d18e71c29ae508fa604ff7699f422ef1.tar.gz nixpkgs-8131ca52d18e71c29ae508fa604ff7699f422ef1.tar.bz2 nixpkgs-8131ca52d18e71c29ae508fa604ff7699f422ef1.tar.lz nixpkgs-8131ca52d18e71c29ae508fa604ff7699f422ef1.tar.xz nixpkgs-8131ca52d18e71c29ae508fa604ff7699f422ef1.tar.zst nixpkgs-8131ca52d18e71c29ae508fa604ff7699f422ef1.zip |
simple-scan: update 3.17.4 -> 3.17.90
Adds a dependency on PackageKit... In better news: - Default to PDF when saving in all cases. - Always show file format options and use a combo box to fit better into dialog. - Detect HP scanners and install drivers using PackageKit if found. - If SANE detects no scanners but we see USB IDs of Brother, Epson or Samsung scanners then prompt the user to go to their website to install drivers. - Use GUsb instead of GUdev. - Fix error dialogs not showing.
Diffstat (limited to 'pkgs/applications/graphics/simple-scan')
-rw-r--r-- | pkgs/applications/graphics/simple-scan/default.nix | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 954b2e02136..2591c3f7ffb 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,15 +1,28 @@ -{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2 -, makeWrapper, pkgconfig, saneBackends, systemd, vala }: +{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb, libxml2 +, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: -let version = "3.17.4"; in +let version = "3.17.90"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "1pslbv45g01g039zj2b01k08f763kkhzqw8wwz7yh27m7bjllnx6"; + sha256 = "0xc3ln97dgvxrwy2qn82k9qvsr5kxksms4igzkivya3xpq2kx85c"; url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; }; + buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit + saneBackends systemd vala ]; + nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ]; + + enableParallelBuilding = true; + + doCheck = true; + + preFixup = '' + wrapProgram "$out/bin/simple-scan" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + meta = with stdenv.lib; { description = "Simple scanning utility"; longDescription = '' @@ -25,17 +38,4 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ cairo colord glib gtk3 libxml2 - saneBackends systemd vala ]; - nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ]; - - enableParallelBuilding = true; - - doCheck = true; - - preFixup = '' - wrapProgram "$out/bin/simple-scan" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; } |