diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix index ef5279613d09..d4a5b79b7fb3 100644 --- a/pkgs/applications/window-managers/compiz/core.nix +++ b/pkgs/applications/window-managers/compiz/core.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation { # directories to be overriden through $COMPIZ_PLUGINDIR and # $COMPIZ_METADATADIR, respectively. ./plugindir-core.patch + + # Fix compilation with recent GTK versions. + ./gdk-deprecated.patch ]; buildInputs = diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch new file mode 100644 index 000000000000..d80a5514ee9d --- /dev/null +++ b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c +--- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200 ++++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100 +@@ -31,10 +31,6 @@ + #include + #include + +-#ifndef GDK_DISABLE_DEPRECATED +-#define GDK_DISABLE_DEPRECATED +-#endif +- + #ifndef GTK_DISABLE_DEPRECATED + #define GTK_DISABLE_DEPRECATED + #endif