diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
| commit | 6345089ca0af23a29387f48060a53dff0d0d30f5 (patch) | |
| tree | aa11989838217951662f46c011205e11d525e4dc /pkgs/desktops/gnome-3/core/mutter/default.nix | |
| parent | 658951917437e7d587c8a206cc6497a7f1192891 (diff) | |
| parent | e69a3248f7c8308b0d583941e8f1bb1a99a431a7 (diff) | |
| download | nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.gz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.bz2 nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.lz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.xz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.zst nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.zip | |
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice in the history, but let's merge this way.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/mutter/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 208b8b756488..be4a5e1087ad 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput , libgudev, libwacom, xwayland, autoreconfHook }: @@ -35,15 +35,6 @@ stdenv.mkDerivation rec { libcanberra_gtk3 zenity xkeyboard_config libxkbfile libxkbcommon ]; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=760670 - (fetchpatch { - name = "libgudev-232.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=358904; - sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix"; - }) - ]; - preFixup = '' wrapProgram "$out/bin/mutter" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" |