diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-14 10:07:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-14 10:07:33 +0000 |
| commit | aaecb6430b2b672dfa7e3dc98afbd794cd8826eb (patch) | |
| tree | 832cda8e6050b10242f4e9505b86d0d503a01dc4 /pkgs/applications/window-managers | |
| parent | 27e2e063fbb9b61eec319c3d7a6d4b27d8bff38f (diff) | |
* Fix Compiz build failure with recent GTK+
(http://hydra.nixos.org/build/955799). svn path=/nixpkgs/branches/x-updates/; revision=26295
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/compiz/core.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/compiz/gdk-deprecated.patch | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix index ef5279613d093..d4a5b79b7fb3c 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 0000000000000..d80a5514ee9da --- /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 <X11/extensions/Xrender.h> + #include <X11/Xregion.h> + +-#ifndef GDK_DISABLE_DEPRECATED +-#define GDK_DISABLE_DEPRECATED +-#endif +- + #ifndef GTK_DISABLE_DEPRECATED + #define GTK_DISABLE_DEPRECATED + #endif |