diff options
| author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2021-11-07 21:29:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-07 21:29:51 +0100 |
| commit | fbdf78236a346f57f716fb66ed62e1993260c9e5 (patch) | |
| tree | d8ad89d78673cf511a52ad329e014f76bc116641 /pkgs/applications/graphics/sane | |
| parent | 3b61f5c4366408ffdffa485457e499867d778b96 (diff) | |
| download | nixpkgs-fbdf78236a346f57f716fb66ed62e1993260c9e5.tar nixpkgs-fbdf78236a346f57f716fb66ed62e1993260c9e5.tar.gz nixpkgs-fbdf78236a346f57f716fb66ed62e1993260c9e5.tar.bz2 nixpkgs-fbdf78236a346f57f716fb66ed62e1993260c9e5.tar.lz nixpkgs-fbdf78236a346f57f716fb66ed62e1993260c9e5.tar.xz nixpkgs-fbdf78236a346f57f716fb66ed62e1993260c9e5.tar.zst nixpkgs-fbdf78236a346f57f716fb66ed62e1993260c9e5.zip | |
pkgs/applications: rename name to pname&version part 1 (#144949)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/applications/graphics/sane')
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sane/xsane.nix | 22 |
2 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index 9ca0a702060..05b018215bb 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: +{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49" }: stdenv.mkDerivation rec { - name = "brother-udev-rule-type1-1.0.0-1"; + pname = "brother-udev-rule-type1"; + version = "1.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006654/${name}.all.deb"; + url = "http://download.brother.com/welcome/dlf006654/brother-udev-rule-type1-${version}.all.deb"; sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi"; }; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index e394acf2b06..8febb819bb3 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng +{ lib +, stdenv +, fetchurl +, sane-backends +, sane-frontends +, libX11 +, gtk2 +, pkg-config +, libpng , libusb-compat-0_1 ? null -, gimpSupport ? false, gimp ? null +, gimpSupport ? false +, gimp ? null }: assert gimpSupport -> gimp != null; stdenv.mkDerivation rec { - name = "xsane-0.999"; + pname = "xsane"; + version = "0.999"; src = fetchurl { - url = "http://www.xsane.org/download/${name}.tar.gz"; + url = "http://www.xsane.org/download/xsane-${version}.tar.gz"; sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; }; @@ -19,8 +29,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) + buildInputs = [ libpng sane-backends sane-frontends libX11 gtk2 ] + ++ (if libusb-compat-0_1 != null then [ libusb-compat-0_1 ] else [ ]) ++ lib.optional gimpSupport gimp; meta = { |