diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
| commit | de0af30716493d647e369f434008a67999ed9e28 (patch) | |
| tree | 2fda05ead70be669e4325e0d661aaafd5d04d3c0 /pkgs/applications/graphics | |
| parent | 2ecb6b4574399cf710f09061357ae59526743a05 (diff) | |
| parent | 4f8f5732fc1a24329cbe5f7eb9dcb7599e282a0c (diff) | |
| download | nixlib-de0af30716493d647e369f434008a67999ed9e28.tar nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.gz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.bz2 nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.lz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.xz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.zst nixlib-de0af30716493d647e369f434008a67999ed9e28.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/graphics')
4 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 072cc698e920..f54628e0b8de 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }: -let version = "7.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "apitrace-${version}"; + version = "7.1"; src = fetchFromGitHub { sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a"; @@ -20,7 +20,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; homepage = https://apitrace.github.io; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index b597250098fe..8f46e647252e 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation { - inherit src; + inherit src version; name = "sane-backends-${version}"; @@ -56,8 +56,6 @@ stdenv.mkDerivation { '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with stdenv.lib; { - inherit version; - description = "SANE (Scanner Access Now Easy) backends"; longDescription = '' Collection of open-source SANE backends (device drivers). diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index a2b7fd77337b..5f8a8ac6b9ae 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool , libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }: -let version = "3.19.4"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; + version = "3.19.4"; src = fetchurl { sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Simple scanning utility"; longDescription = '' A really easy way to scan both documents and photos. You can crop out the diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 0f85bf58c55e..53bdbcd12740 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeDesktopItem, unzip, jre }: -let version = "0.2"; in stdenv.mkDerivation rec { name = "swingsane-${version}"; + version = "0.2"; src = fetchurl { sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni"; @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "Java GUI for SANE scanner servers (saned)"; longDescription = '' SwingSane is a powerful, cross platform, open source Java front-end for |