diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-30 08:57:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-30 08:58:01 +0100 |
| commit | 9f8441554123a3ba06345454c0d6717e303a79ed (patch) | |
| tree | a54b76aeeaaafc8ee054a9e300f41f000ddb26fe /pkgs/desktops/gnome-3/core | |
| parent | 5bdd7a59c072f958af57b2daf134b983c3d4b0af (diff) | |
| parent | d14baf7747b0d8e17c0a13db673b28f13e06a349 (diff) | |
| download | nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.gz nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.bz2 nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.lz nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.xz nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.tar.zst nixpkgs-9f8441554123a3ba06345454c0d6717e303a79ed.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
4 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 61f27f10ae1..bab84eeb78c 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45"; + sha256 = "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w"; }; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index fa70ecea264..6c293cb55b9 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1gisymfjhkibqy73pmd0d3fwl43a23d0lvlxzqkycfdn9jh6pxbg"; + sha256 = "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 8fad9e3c288..6d36b8710b6 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -10,6 +10,7 @@ , sysprof , desktop-file-utils , libcap_ng +, egl-wayland }: stdenv.mkDerivation rec { @@ -26,6 +27,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland-path=${xwayland}/bin/Xwayland" "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + "-Degl_device=true" ]; propagatedBuildInputs = [ @@ -52,7 +55,7 @@ stdenv.mkDerivation rec { gnome-desktop cairo pango cogl zenity libstartup_notification geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon pipewire xwayland + libxkbcommon pipewire xwayland egl-wayland gnome-settings-daemon sysprof ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 21e198a867f..8d737b22a7a 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0glzskxdc7p9z7nwcakqc7qzij4l79adlvvb2cj5fmis731zw9yq"; + sha256 = "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp"; }; buildInputs = [ |