diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch | |
parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch')
-rw-r--r-- | pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch new file mode 100644 index 000000000000..207816a3c518 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch @@ -0,0 +1,39 @@ +diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp +--- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200 ++++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200 +@@ -3004,7 +3004,10 @@ + } + } + +- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR); ++ char *metadatadir = getenv("COMPIZ_METADATADIR"); ++ if (!metadatadir) metadatadir = METADATADIR; ++ ++ loadPluginFromXMLFile (context, xmlName, metadatadir); + free (xmlName); + } + +@@ -3031,7 +3034,10 @@ + free (homeplugins); + } + } +- loadPluginsFromXMLFiles (context, (char *)METADATADIR); ++ ++ char *metadatadir = getenv("COMPIZ_METADATADIR"); ++ if (!metadatadir) metadatadir = METADATADIR; ++ loadPluginsFromXMLFiles (context, metadatadir); + + if (home && strlen (home)) + { +@@ -3043,7 +3049,10 @@ + free (homeplugins); + } + } +- loadPluginsFromName (context, (char *)PLUGINDIR); ++ ++ char *plugindir = getenv("COMPIZ_PLUGINDIR"); ++ if (!plugindir) plugindir = PLUGINDIR; ++ loadPluginsFromName (context, plugindir); + } + + static void |