diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-18 17:55:04 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-18 17:55:04 +0200 |
| commit | 4cf394ea3f173946363c40439b03ebcd92eb2bb4 (patch) | |
| tree | 59d51185dc4aa583270396ce18fb2143a7e0fe1c /pkgs/desktops | |
| parent | 9da079c6ff5e2870485ed014fe388a5c67997535 (diff) | |
| parent | 0a84375ddb9c41fb5ffa9bf9785debcec84b0614 (diff) | |
| download | nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.gz nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.bz2 nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.lz nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.xz nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.zst nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/games/aisleriot/default.nix | 65 |
2 files changed, 55 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 071245ae1ea..79cbbb9f5a8 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -42,13 +42,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.36.4"; + version = "3.36.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p3jglw6f2h67kwk89qz1rz23y25lip8m2mp2xshf2vrg4a930as"; + sha256 = "1py7sqrpvg2qvswxclshysx7hd9jk65i6cwqsagd6rg6rnjhblp0"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index e4de15c79b2..9ea68b02ea8 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,23 +1,64 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, librsvg, libxml2, desktop-file-utils -, guile_2_0, libcanberra-gtk3 }: +{ stdenv +, fetchFromGitLab +, pkg-config +, gnome3 +, itstool +, gtk3 +, wrapGAppsHook +, meson +, librsvg +, libxml2 +, desktop-file-utils +, pysolfc +, guile +, libcanberra-gtk3 +, ninja +, appstream-glib +, yelp-tools +}: stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.9"; + version = "3.22.11"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji"; + src = fetchFromGitLab { + owner = "GNOME"; + repo = pname; + domain = "gitlab.gnome.org"; + rev = "${version}"; + sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1"; }; - configureFlags = [ - "--with-card-theme-formats=svg" - "--with-platform=gtk-only" # until they remove GConf + nativeBuildInputs = [ + wrapGAppsHook + meson + ninja + appstream-glib + pkg-config + itstool + libxml2 + desktop-file-utils + yelp-tools ]; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ]; - buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ]; + buildInputs = [ + gtk3 + librsvg + guile + libcanberra-gtk3 + pysolfc + ]; + + prePatch = '' + patchShebangs cards/meson_svgz.sh + patchShebangs data/meson_desktopfile.py + patchShebangs data/icons/meson_updateiconcache.py + patchShebangs src/lib/meson_compileschemas.py + ''; + + mesonFlags = [ + "-Dtheme_kde=false" + ]; passthru = { updateScript = gnome3.updateScript { |