ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

mutter: fix on i686-linux

Browse Source
This commit is contained in:
Robin Gloster 2017-03-21 23:49:42 +01:00
parent dec8fb077f
commit 242031a34e
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";
configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
patches = [
#./x86.patch ./math.patch
./x86.patch # ./math.patch
];
enableParallelBuilding = true;

13
pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
View File

@ -18,16 +18,3 @@
MetaRectangle unconstrained_rect;
MetaRectangle constrained_rect;
MetaMoveResizeResultFlags result = 0;
--- a/src/core/startup-notification.c 2016-06-06 12:13:27.100251933 +0200
+++ b/src/core/startup-notification.c 2016-06-06 12:13:42.554956773 +0200
@@ -418,7 +418,7 @@
elapsed = ctod->now - timestamp;
meta_topic (META_DEBUG_STARTUP,
- "Sequence used %ld ms vs. %d max: %s\n",
+ "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
elapsed, STARTUP_TIMEOUT,
meta_startup_notification_sequence_get_id (sequence));
[?25l[?25h[?1049h[?1h=[?25h[?25l~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [?25h[?25lType :quit<Enter> to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h
[?1l>[?1049l