diff options
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 23 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 54 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/simple-scan/default.nix | 60 |
3 files changed, 103 insertions, 34 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 7494d66cc0d9..b64094002bb8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -27,22 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc"; + sha256 = "8RsbIuwfKF5QmINoTAsfSlFJauoQVZEjnlsm+JhnUeY="; }; - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; - }; - }; - - doCheck = true; - nativeBuildInputs = [ vala meson @@ -55,6 +46,7 @@ stdenv.mkDerivation rec { libxml2 gobject-introspection # for finding vapi files ]; + buildInputs = [ gtk3 glib @@ -76,6 +68,15 @@ stdenv.mkDerivation rec { ) ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome3.gnome-clocks"; + }; + }; + meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 7eda4a706cab..acd4386d2e73 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,25 +1,57 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, glib +, gtk3 +, wrapGAppsHook +, gettext +, itstool +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, systemd +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m"; + sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA="; }; - mesonFlags = [ - "-Dman=true" - ]; - nativeBuildInputs = [ python3 - meson ninja pkgconfig wrapGAppsHook gettext itstool - libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkgconfig + wrapGAppsHook + gettext + itstool + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + gtk3 + systemd + gsettings-desktop-schemas + gnome3.adwaita-icon-theme + ]; + + mesonFlags = [ + "-Dman=true" ]; - buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index d38339425ce7..1fefa7dd393d 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,24 +1,60 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3, gobject-introspection }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, itstool +, python3 +, wrapGAppsHook +, cairo +, gdk-pixbuf +, colord +, glib +, gtk3 +, gusb +, packagekit +, libwebp +, libxml2 +, sane-backends +, vala +, gnome3 +, gobject-introspection +}: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.2"; + version = "3.36.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; + sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs="; }; - buildInputs = [ - cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb - gtk3 libwebp packagekit sane-backends vala - ]; nativeBuildInputs = [ - meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 - # For setup hook - gobject-introspection + meson + ninja + gettext + itstool + pkgconfig + python3 + wrapGAppsHook + libxml2 + gobject-introspection # For setup hook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + colord + glib + gnome3.adwaita-icon-theme + gusb + gtk3 + libwebp + packagekit + sane-backends + vala ]; postPatch = '' |