Unverified Commit f5d04780 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #162229 from jtojnar/gnome-backports 

GNOME: Backport fixes & stable updates from 42 branch
parents bd76fed6 60ae3a17

pkgs/applications/video/clapper/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
, desktop-file-utils

, makeWrapper

, shared-mime-info

, wrapGAppsHook

, wrapGAppsHook4

, meson

, gjs

, gtk4
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 
    pkg-config

    python3

    shared-mime-info # for update-mime-database

    wrapGAppsHook # for gsettings

    wrapGAppsHook4 # for gsettings

  ];



  buildInputs = [

pkgs/desktops/gnome/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ lib.makeScope pkgs.newScope (self: with self; { 


  gitg = callPackage ./misc/gitg { };



  libgnome-games-support = callPackage ./misc/libgnome-games-support { };



  gnome-applets = callPackage ./misc/gnome-applets { };



  gnome-flashback = callPackage ./misc/gnome-flashback { };
@@ -283,6 +281,8 @@ lib.makeScope pkgs.newScope (self: with self; { 
}) // lib.optionalAttrs (config.allowAliases or true) {

#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.



  libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19



  bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26

  evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25

  geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25
@@ -300,7 +300,7 @@ lib.makeScope pkgs.newScope (self: with self; { 
  gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25

  gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21

  gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25

  libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14

  libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14

  libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25

  rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25

  networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25

pkgs/desktops/gnome/games/gnome-2048/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
, itstool

, clutter-gtk

, libgee

, libgnome-games-support

, gnome

, gtk3

}:
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    clutter-gtk

    libgee

    gnome.libgnome-games-support

    libgnome-games-support

    gtk3

  ];

pkgs/development/libraries/accountsservice/default.nix

+2 −12
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchpatch

, substituteAll

, pkg-config

, glib
@@ -20,13 +19,13 @@ 


stdenv.mkDerivation rec {

  pname = "accountsservice";

  version = "22.07.5";

  version = "22.08.8";



  outputs = [ "out" "dev" ];



  src = fetchurl {

    url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";

    sha256 = "IdRJwN6tilQ86o8R5x6wSWwDXXMOpIOTOXowKzpMfBo=";

    sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E=";

  };



  patches = [
@@ -45,15 +44,6 @@ stdenv.mkDerivation rec { 
    # Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.

    # Fixes https://github.com/NixOS/nixpkgs/issues/72396

    ./drop-prefix-check-extensions.patch



    # Work around not being able to set profile picture in GNOME Settings.

    # https://github.com/NixOS/nixpkgs/issues/85357

    # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/98

    # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1629

    (fetchpatch {

      url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/1ef3add46983af875adfed5d29954cbfb184f688.patch";

      sha256 = "N4siK4SWkwYBnFa0JJUFgahi9XBkB/nS5yc+PyH3/iM=";

    })

  ];



  nativeBuildInputs = [

pkgs/development/libraries/libgda/6.x.nix

+15 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchpatch

, pkg-config

, intltool

, meson
@@ -37,6 +38,20 @@ stdenv.mkDerivation rec { 
    sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr";

  };



  patches = [

    # Fix undefined behavior

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch";

      sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk=";

    })



    # Fix building vapi

    (fetchpatch {

      url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch";

      sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8=";

    })

  ];



  nativeBuildInputs = [

    pkg-config

    intltool