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: 6d1d5addeeb3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3fe7f47ad3ce
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 12, 2018

  1. fixup! gnome3.mutter: 3.28.3 → 3.30.1

    @hedning
    hedning committed Nov 12, 2018
    Copy the full SHA
    c7c62b8 View commit details

  2. squash! gnome3.gdm: 3.28.3 → 3.30.1 

    gnome3.gdm: 3.28.3 → 3.30.2
    @hedning
    hedning committed Nov 12, 2018
    Copy the full SHA
    3fe7f47 View commit details
Showing with 5 additions and 13 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/core/gdm/default.nix
  2. +2 −2 pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
  3. +1 −9 pkgs/desktops/gnome-3/core/mutter/default.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gdm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "gdm-${version}";
version = "3.30.1";
version = "3.30.2";

src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0bvkwa474lq6v4sbpy7glp9c57cydqcjqx5j8dmw57yzda2i2gab";
sha256 = "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y";
};

# Only needed to make it build
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -49,12 +49,12 @@
g_error_free (error);
--- a/data/gdm.service.in
+++ b/data/gdm.service.in
@@ -28,7 +28,7 @@
@@ -28,7 +28,7 @@ BusName=org.gnome.DisplayManager
StandardOutput=syslog
StandardError=inherit
EnvironmentFile=-@LANG_CONFIG_FILE@
-ExecReload=/bin/kill -SIGHUP $MAINPID
+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
KeyringMode=shared

[Install]
Alias=display-manager.service
10 changes: 1 addition & 9 deletions pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, pipewire, libgudev, libwacom, xwayland, autoreconfHook, fetchpatch }:
, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:

stdenv.mkDerivation rec {
name = "mutter-${version}";
@@ -16,14 +16,6 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; };
};

patches = [
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/172
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/mutter/commit/62660bbd.patch;
sha256 = "1qq8vxlqnyrqh94dc0dh1aj1dsbyw6bwv3x46q5vsscbbxbiv9wk";
})
];

configureFlags = [
"--with-x"
"--disable-static"