diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-05-26 10:56:25 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-05-26 10:57:01 +0200 |
| commit | 4053dcdacea8e18aa6403a8c8bccbaf3f09edd51 (patch) | |
| tree | d4242f94fc9a8cf7612bd1c59fce0a5684f3effa /pkgs/desktops | |
| parent | 138a51b84b5a5effa24252ce2e7dc5b8670798cb (diff) | |
| download | nixlib-4053dcdacea8e18aa6403a8c8bccbaf3f09edd51.tar nixlib-4053dcdacea8e18aa6403a8c8bccbaf3f09edd51.tar.gz nixlib-4053dcdacea8e18aa6403a8c8bccbaf3f09edd51.tar.bz2 nixlib-4053dcdacea8e18aa6403a8c8bccbaf3f09edd51.tar.lz nixlib-4053dcdacea8e18aa6403a8c8bccbaf3f09edd51.tar.xz nixlib-4053dcdacea8e18aa6403a8c8bccbaf3f09edd51.tar.zst nixlib-4053dcdacea8e18aa6403a8c8bccbaf3f09edd51.zip | |
mutter: fix failure on i686
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/mutter/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch | 20 |
2 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix index 3df5d9f55d9a..9b91cd987778 100644 --- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { - name = "mutter-${gnome3.version}.1.1"; + name = "mutter-${gnome3.version}.2"; src = fetchurl { url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz"; - sha256 = "07059jmwhc7zf2gww2xw94hhy4csjj2v30ivyzllbas2nvv88l3r"; + sha256 = "0qq7gpkljn1z45sg2sxvmia52krj4ck2541iar89z99s1cppaasa"; }; # fatal error: gio/gunixfdlist.h: No such file or directory @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + patches = [ ./x86.patch ]; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch new file mode 100644 index 000000000000..bc8829de42f1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch @@ -0,0 +1,20 @@ +--- mutter-3.16.2/src/core/window.c.orig 2015-05-26 10:52:41.382834963 +0200 ++++ mutter-3.16.2/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 +@@ -3499,7 +3499,7 @@ + + static MetaMonitorInfo * + find_monitor_by_winsys_id (MetaWindow *window, +- guint winsys_id) ++ gint winsys_id) + { + int i; + +@@ -3618,7 +3618,7 @@ + */ + + gboolean did_placement; +- guint old_output_winsys_id; ++ gint old_output_winsys_id; + MetaRectangle unconstrained_rect; + MetaRectangle constrained_rect; + MetaMoveResizeResultFlags result = 0; |