diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-05-29 08:38:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-29 08:38:21 +0000 |
commit | 97aba37876c4513102b0acef05f3438c0b896840 (patch) | |
tree | a5588fe46f892687b80e2c782ba9cb3834f7f50f /pkgs/applications/graphics | |
parent | 3dbb0207738e9102dacfb1bc60d455ef204759be (diff) | |
parent | 36a6746f2178141465761ce36de888389bc2968a (diff) | |
download | nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.gz nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.bz2 nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.lz nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.xz nixlib-97aba37876c4513102b0acef05f3438c0b896840.tar.zst nixlib-97aba37876c4513102b0acef05f3438c0b896840.zip |
Merge pull request #61657 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/glabels/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/graphics/gthumb/default.nix | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index dadae22bf0c3..6bc59cd7d02b 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "glabels-${version}"; + pname = "glabels"; version = "3.4.1"; src = fetchurl { - url = "mirror://gnome/sources/glabels/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { description = "Create labels and business cards"; homepage = https://glabels.org/; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index e88c9222b87c..6f4ddf27b90d 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -4,14 +4,12 @@ libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, flex, wrapGAppsHook, shared-mime-info }: -let +stdenv.mkDerivation rec { pname = "gthumb"; version = "3.6.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9"; }; @@ -40,7 +38,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/gthumb; + homepage = "https://wiki.gnome.org/Apps/Gthumb"; description = "Image browser and viewer for GNOME"; platforms = platforms.linux; license = licenses.gpl2; |