diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-01-28 10:51:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-28 10:51:12 +0100 |
| commit | 67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8 (patch) | |
| tree | 994fbc384aa1aea3d014d9d0ef7126e03b9dec2e /pkgs/desktops | |
| parent | c114d0cf8c314256012675cb0de23f559c8b6882 (diff) | |
| parent | ee2109e912416167d0bdddede14e9e5b6d40fa4f (diff) | |
| download | nixpkgs-67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8.tar nixpkgs-67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8.tar.gz nixpkgs-67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8.tar.bz2 nixpkgs-67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8.tar.lz nixpkgs-67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8.tar.xz nixpkgs-67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8.tar.zst nixpkgs-67e3a88fa5fcbe19c2dd8dda2fa8ab590b445de8.zip | |
Merge pull request #213091 from bobby285271/upd/gnome
GNOME updates
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/misc/gpaste/default.nix | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 90ef25fcca5..9018df07e9c 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ftJ0KJz1ykELHJKxU3BQpcNi99szmaMrU0PQ3nBGbkk="; + sha256 = "we6/QJPzNrSJ+5HHMO2mcdpo7vZeYZehKYqVRseImZ8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index bc54591ebd6..adee04a0df8 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , appstream-glib , clutter , gjs @@ -22,26 +21,18 @@ }: stdenv.mkDerivation rec { - version = "43.0"; + version = "43.1"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-F+AWTYVK145RzJ1Zldh4Q4R/hN/D7aXO3SIJ1t6ClWs="; + sha256 = "sha256-wOxhaYWX76jSur3uh75vDfAedbiLh2ikoMuobCZx3jE="; }; patches = [ ./fix-paths.patch - - # Build against GCR 4. - # Patch was temporarily reverted. - # https://github.com/Keruspe/GPaste/pull/409 - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/0378cb4a657042ce5321f1d9728cff31e55bede6.patch"; - sha256 = "0Ngr+/fS5/wICR84GEiE0pXEXQ/f/3G59lDivH167m8="; - }) ]; # TODO: switch to substituteAll with placeholder @@ -79,6 +70,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ + "-Dgcr3=false" # Build with gcr4 "-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings" "-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services" "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" |