diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-01 14:23:10 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-01 14:23:10 +0100 |
commit | ff90abd5dd36ebc248f66a293f5d4bb86f333238 (patch) | |
tree | 8325a265eac8590b01c7f0507935756d068e5cce /pkgs/desktops | |
parent | c3452dae0ed7d837c7888242cba3a84dbbfe3292 (diff) | |
parent | 0aa147911ce1410a82c7c6a332f93c765038df83 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 69 |
2 files changed, 50 insertions, 23 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 014ad123b412..7f0c7c4f621d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zrm4mihkx5i42h3pvk9lmsqf983dqz4rnfcbccwhx4ml2s4w3qv"; + sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index a51eb854e73f..a042ce134a94 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -1,42 +1,69 @@ -{ stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas -, itstool, libxml2, python3Packages, libhandy_0 -, gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: +{ lib +, meson +, ninja +, fetchurl +, gdk-pixbuf +, gettext +, glib +, gnome3 +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, itstool +, libhandy_0 +, libnotify +, libsoup +, libxml2 +, pkg-config +, python3Packages +, wrapGAppsHook }: -let +python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; version = "3.34.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python + gettext + gobject-introspection + itstool + libxml2 + meson + ninja + pkg-config + wrapGAppsHook ]; + buildInputs = [ - gtk3 glib gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme - libnotify gnome3.gnome-shell python3Packages.pygobject3 - libsoup gnome3.gnome-settings-daemon gnome3.nautilus - gnome3.mutter gnome3.gnome-desktop gobject-introspection - gnome3.nautilus libhandy_0 + gdk-pixbuf + glib + gnome3.gnome-desktop + gnome3.gnome-settings-daemon + gnome3.gnome-shell # Makes it possible to select user themes through the `user-theme` extension gnome3.gnome-shell-extensions + gnome3.mutter + gsettings-desktop-schemas + gtk3 + libhandy_0 + libnotify + libsoup + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 ]; postPatch = '' patchShebangs meson-postinstall.py ''; - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -44,7 +71,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; description = "A tool to customize advanced GNOME 3 options"; maintainers = teams.gnome.members; |