Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 07990208d162
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da1e2f35ec02
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 14, 2021

  1. gnome3.sushi: Remove clutter dependency 

    Not used since 3.33.0.
    @jtojnar
    jtojnar committed Apr 14, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6eb25fa View commit details

  2. fixup! gnome3.mutter: 3.38.3 → 40.0

    @jtojnar
    jtojnar committed Apr 14, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    frenck Franck Nijhof
    GPG key ID: D62583BA8AB11CA3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    da1e2f3 View commit details
Showing with 9 additions and 8 deletions.
  1. +8 −4 pkgs/desktops/gnome-3/core/mutter/default.nix
  2. +1 −4 pkgs/desktops/gnome-3/core/sushi/default.nix
12 changes: 8 additions & 4 deletions pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -60,6 +60,13 @@ let self = stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit zenity;
})

# Fix non-deterministic build failure:
# https://gitlab.gnome.org/GNOME/mutter/-/issues/1682
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch";
sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU=";
})
];

mesonFlags = [
@@ -71,9 +78,6 @@ let self = stdenv.mkDerivation rec {
# This should be auto detected, but it looks like it manages a false
# positive.
"-Dxwayland_initfd=disabled"
# We are not running tests and building them causes non-deterministic build failure:
# https://gitlab.gnome.org/GNOME/mutter/-/issues/1682
"-Dtests=false"
];

propagatedBuildInputs = [
@@ -152,7 +156,7 @@ let self = stdenv.mkDerivation rec {
meta = with lib; {
description = "A window manager for GNOME";
homepage = "https://gitlab.gnome.org/GNOME/mutter";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
5 changes: 1 addition & 4 deletions pkgs/desktops/gnome-3/core/sushi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,6 @@
, gettext
, gobject-introspection
, glib
, clutter-gtk
, clutter-gst
, gnome3
, gtksourceview4
, gjs
@@ -40,14 +38,13 @@ stdenv.mkDerivation rec {
gobject-introspection
wrapGAppsHook
];

buildInputs = [
glib
gtk3
gnome3.evince
icu
harfbuzz
clutter-gtk
clutter-gst
gjs
gtksourceview4
gdk-pixbuf