diff options
author | Tobias Geerinckx-Rice <nckx@users.noreply.github.com> | 2016-10-12 17:36:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 17:36:35 +0200 |
commit | 61a789888af50a2afa2c23d21355d42a570e2e8b (patch) | |
tree | 05e9c60d6b278291f98f267a0058c746dc80fa10 /pkgs/applications/graphics | |
parent | 8c95f0ffafbde396d607d0ca5d4925f8bc37588b (diff) | |
parent | f2c3e29ac47f24518968f3bcc3e8129476b8a887 (diff) | |
download | nixlib-61a789888af50a2afa2c23d21355d42a570e2e8b.tar nixlib-61a789888af50a2afa2c23d21355d42a570e2e8b.tar.gz nixlib-61a789888af50a2afa2c23d21355d42a570e2e8b.tar.bz2 nixlib-61a789888af50a2afa2c23d21355d42a570e2e8b.tar.lz nixlib-61a789888af50a2afa2c23d21355d42a570e2e8b.tar.xz nixlib-61a789888af50a2afa2c23d21355d42a570e2e8b.tar.zst nixlib-61a789888af50a2afa2c23d21355d42a570e2e8b.zip |
Merge pull request #19482 from peterhoeg/ss
simple-scan: 3.21 -> 3.22
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/simple-scan/default.nix | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 8af753ac29c4..8a24eab22007 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb1, libxml2, pkgconfig, sane-backends, vala_0_23, wrapGAppsHook +, libusb1, libxml2, pkgconfig, sane-backends, vala_0_32, wrapGAppsHook , gnome3 }: stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.21.1"; + version = "${major_version}.0.1"; + major_version = "3.22"; src = fetchurl { - sha256 = "00w206isni8m8qd9m8x0644s1gqg11pvgnw6zav33b0bs2h2kk79"; - url = "https://launchpad.net/simple-scan/3.21/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz"; + sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5"; }; - buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends - vala_0_23 ]; + buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; configureFlags = [ "--disable-packagekit" ]; @@ -27,18 +27,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ( - cd ${gnome3.defaultIconTheme}/share/icons/Adwaita - - for f in `find . | grep 'scanner\.'` - do - local outFile="`echo "$out/share/icons/hicolor/$f" | sed \ - -e 's#/devices/#/apps/#g' \ - -e 's#scanner\.#simple-scan\.#g'`" - mkdir -p "`realpath -m "$outFile/.."`" - cp "$f" "$outFile" - done - ) + mkdir -p $out/share/icons + mv $out/share/simple-scan/icons/* $out/share/icons/ ''; enableParallelBuilding = true; |