public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simple-scan: 3.21 -> 3.22 

Additionally, fix the icons and use a newer version of vala.
This commit is contained in:
Peter Hoeg 2016-10-12 19:14:25 +08:00
parent adfcc2d953
commit f2c3e29ac4
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/graphics/simple-scan/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool { 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 }: , gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simple-scan-${version}"; name = "simple-scan-${version}";
version = "3.21.1"; version = "${major_version}.0.1";
major_version = "3.22";
src = fetchurl { src = fetchurl {
sha256 = "00w206isni8m8qd9m8x0644s1gqg11pvgnw6zav33b0bs2h2kk79"; url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz";
url = "https://launchpad.net/simple-scan/3.21/${version}/+download/${name}.tar.xz"; sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5";
}; };
buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ];
vala_0_23 ];
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
configureFlags = [ "--disable-packagekit" ]; configureFlags = [ "--disable-packagekit" ];
@ -27,18 +27,8 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
( mkdir -p $out/share/icons
cd ${gnome3.defaultIconTheme}/share/icons/Adwaita mv $out/share/simple-scan/icons/* $out/share/icons/
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
)
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;