summary refs log tree commit diff
path: root/pkgs/applications/graphics/sane
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-09-10 15:45:41 +0800
committerPeter Hoeg <peter@hoeg.com>2017-09-10 15:46:43 +0800
commitaf1f99143f456fb768c88544d299964fc1cadfd9 (patch)
tree6ec67ceebf7f118953c5ac65f2a4a545bd08eac1 /pkgs/applications/graphics/sane
parent67c949a8b6367236867782fe6aa6ec2900ef9894 (diff)
downloadnixpkgs-af1f99143f456fb768c88544d299964fc1cadfd9.tar
nixpkgs-af1f99143f456fb768c88544d299964fc1cadfd9.tar.gz
nixpkgs-af1f99143f456fb768c88544d299964fc1cadfd9.tar.bz2
nixpkgs-af1f99143f456fb768c88544d299964fc1cadfd9.tar.lz
nixpkgs-af1f99143f456fb768c88544d299964fc1cadfd9.tar.xz
nixpkgs-af1f99143f456fb768c88544d299964fc1cadfd9.tar.zst
nixpkgs-af1f99143f456fb768c88544d299964fc1cadfd9.zip
sane-frontends: boy scout cleanups
Diffstat (limited to 'pkgs/applications/graphics/sane')
-rw-r--r--pkgs/applications/graphics/sane/frontends.nix25
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index a956db40052..f6994db81e4 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}:
+{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
 
 stdenv.mkDerivation rec {
-  name = "sane-frontends-1.0.14";
+  name = "sane-frontends-${version}";
+  version = "1.0.14";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz";
+    url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz";
     sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
   };
 
@@ -12,15 +13,17 @@ stdenv.mkDerivation rec {
     sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
   '';
 
-  buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++
-	(if libusb != null then [libusb] else []);
+  buildInputs = [ sane-backends libX11 gtk2 ]
+    ++ stdenv.lib.optional (libusb != null) libusb;
+  nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
-    homepage = http://www.sane-project.org/;
-    description = "Scanner Access Now Easy";
-    license = stdenv.lib.licenses.gpl2Plus;
+  enableParallelBuilding = true;
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Scanner Access Now Easy";
+    homepage    = http://www.sane-project.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ peti ];
+    platforms   = platforms.linux;
   };
 }