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

Commits on Apr 7, 2021

  1. fixup! gnome3.gdm: 40.rc → 40.0

    @jtojnar
    jtojnar committed Apr 7, 2021
    Copy the full SHA
    598bf27 View commit details

  2. fixup! gjs: fix installed tests

    @jtojnar
    jtojnar committed Apr 7, 2021
    Copy the full SHA
    4ebd078 View commit details
Showing with 23 additions and 8 deletions.
  1. +9 −0 pkgs/desktops/gnome-3/core/gdm/default.nix
  2. +14 −8 pkgs/development/libraries/gjs/default.nix
9 changes: 9 additions & 0 deletions pkgs/desktops/gnome-3/core/gdm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -96,6 +96,15 @@ stdenv.mkDerivation rec {
sha256 = "ZUXKZS4T0o0hzrApxaqcR0txCRv5zBgqeQ9K9fLNX1o=";
})

# GDM fails to find g-s with the following error in the journal.
# gdm-x-session[976]: dbus-run-session: failed to exec 'gnome-session': No such file or directory
# https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch";
sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q=";
revert = true;
})

# Change hardcoded paths to nix store paths.
(substituteAll {
src = ./fix-paths.patch;
22 changes: 14 additions & 8 deletions pkgs/development/libraries/gjs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,20 @@ in stdenv.mkDerivation rec {
sha256 = "1vqsmzy2wmyhmq37y2c6jl0wq4xnicf0z7k6jaxn3aw11sh783ph";
};

patches = [
# Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3961.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/58337929c338e7b5c0a35196d783d3b2be542900.patch";
sha256 = "QgmU+d838fU5LiS4lhTF+179U1lY1L5tJbYtX/oc68k=";
})

# Hard-code various paths
./fix-paths.patch

# Allow installing installed tests to a separate output.
./installed-tests-path.patch
];

outputs = [ "out" "dev" "installedTests" ];

nativeBuildInputs = [
@@ -69,14 +83,6 @@ in stdenv.mkDerivation rec {
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];

patches = [
# Hard-code various paths
./fix-paths.patch

# Allow installing installed tests to a separate output.
./installed-tests-path.patch
];

doCheck = true;

postPatch = ''