commit 7333c01dbab997ba1fbedcf48e394e597383e64d · pyrox.dev/nixpkgs

-17

pkgs/applications/window-managers/compiz/bcop.nix

··· 1 - { stdenv, fetchurl, pkgconfig, libxslt }: 2 - 3 - stdenv.mkDerivation rec { 4 - name = "compiz-bcop-0.8.4"; 5 - 6 - src = fetchurl { 7 - url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2"; 8 - sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk"; 9 - }; 10 - 11 - buildInputs = [ pkgconfig libxslt ]; 12 - 13 - meta = { 14 - homepage = http://www.compiz.org/; 15 - description = "Code generator for Compiz plugins"; 16 - }; 17 - }

-31

pkgs/applications/window-managers/compiz/ccsm.nix

··· 1 - { stdenv, fetchurl, makeWrapper, intltool, gtk 2 - , python, pygtk, pygobject, pycairo, compizconfig_python }: 3 - 4 - stdenv.mkDerivation rec { 5 - name = "ccsm-0.8.4"; 6 - 7 - src = fetchurl { 8 - url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2"; 9 - sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6"; 10 - }; 11 - 12 - buildInputs = [ makeWrapper python intltool gtk ]; 13 - 14 - buildPhase = "python setup.py build --prefix=$out"; 15 - 16 - pythonDeps = [ pygtk pygobject pycairo compizconfig_python ]; 17 - 18 - installPhase = 19 - '' 20 - python setup.py install --prefix=$out 21 - 22 - wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \ 23 - "$(toPythonPath "$pythonDeps $out")" 24 - ''; 25 - 26 - meta = { 27 - homepage = http://www.compiz.org/; 28 - description = "Compiz settings manager"; 29 - platforms = stdenv.lib.platforms.linux; 30 - }; 31 - }

-20

pkgs/applications/window-managers/compiz/config-python.nix

··· 1 - { stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib 2 - , python, pyrex }: 3 - 4 - stdenv.mkDerivation rec { 5 - name = "compizconfig-python-0.8.4"; 6 - 7 - src = fetchurl { 8 - url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2"; 9 - sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37"; 10 - }; 11 - 12 - buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ]; 13 - 14 - NIX_LDFLAGS = "-lcompizconfig"; 15 - 16 - meta = { 17 - homepage = http://www.compiz.org/; 18 - description = "Python interface to the Compiz configuration"; 19 - }; 20 - }

-40

pkgs/applications/window-managers/compiz/core.nix

··· 1 - { stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt 2 - , libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }: 3 - 4 - let version = "0.8.6"; in 5 - 6 - stdenv.mkDerivation { 7 - name = "compiz-${version}"; 8 - 9 - src = fetchurl { 10 - url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2"; 11 - sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4"; 12 - }; 13 - 14 - patches = 15 - [ # Allow the path to the Compiz plugin library and metadata 16 - # directories to be overriden through $COMPIZ_PLUGINDIR and 17 - # $COMPIZ_METADATADIR, respectively. 18 - ./plugindir-core.patch 19 - 20 - # Fix compilation with recent GTK versions. 21 - ./gdk-deprecated.patch 22 - ]; 23 - 24 - buildInputs = 25 - [ intltool pkgconfig libpng glib 26 - gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2 27 - ]; 28 - 29 - propagatedBuildInputs = 30 - [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender 31 - xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama 32 - libstartup_notification mesa libxml2 libxslt 33 - ]; 34 - 35 - meta = { 36 - homepage = http://www.compiz.org/; 37 - description = "A compositing window manager"; 38 - platforms = stdenv.lib.platforms.linux; 39 - }; 40 - }

+51

pkgs/applications/window-managers/compiz/default.nix

··· 1 + {stdenv, fetchurl, cmake, pkgconfig 2 + , libXrender, renderproto, gtk, libwnck, pango, cairo 3 + , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm 4 + , libstartup_notification, libpthreadstubs, libxcb, intltool 5 + , ORBit2, libXau 6 + , dbus, dbus_glib, librsvg, mesa 7 + , libXdmcp, libnotify, python 8 + , hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus 9 + , xdg_utils 10 + , gettext, boost, pyrex 11 + }: 12 + let 13 + s = # Generated upstream information 14 + rec { 15 + baseName="compiz"; 16 + version="0.9.8.6"; 17 + name="compiz-0.9.8.6"; 18 + hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; 19 + url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2"; 20 + sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; 21 + }; 22 + buildInputs = [cmake pkgconfig 23 + libXrender renderproto gtk libwnck pango cairo 24 + GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification 25 + libpthreadstubs libxcb intltool 26 + ORBit2 libXau 27 + dbus dbus_glib librsvg mesa 28 + libXdmcp libnotify python 29 + hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus 30 + xdg_utils 31 + gettext boost pyrex 32 + ]; 33 + in 34 + stdenv.mkDerivation rec { 35 + inherit (s) name version; 36 + src = fetchurl { 37 + inherit (s) url sha256; 38 + }; 39 + inherit buildInputs; 40 + 41 + NIX_CFLAGS_COMPILE=" -Wno-error "; 42 + 43 + meta = { 44 + description = "Compoziting window manager"; 45 + homepage = "http://launchpad.net/compiz/"; 46 + license = stdenv.lib.licenses.gpl2; 47 + maintainers = [stdenv.lib.maintainers.raskin]; 48 + platforms = stdenv.lib.platforms.linux; 49 + inherit (s) version; 50 + }; 51 + }

+1

pkgs/applications/window-managers/compiz/default.upstream

··· 1 + url https://launchpad.net/compiz/+download

-14

pkgs/applications/window-managers/compiz/gdk-deprecated.patch

··· 1 - 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 2 - --- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200 3 - +++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100 4 - @@ -31,10 +31,6 @@ 5 - #include <X11/extensions/Xrender.h> 6 - #include <X11/Xregion.h> 7 - 8 - -#ifndef GDK_DISABLE_DEPRECATED 9 - -#define GDK_DISABLE_DEPRECATED 10 - -#endif 11 - - 12 - #ifndef GTK_DISABLE_DEPRECATED 13 - #define GTK_DISABLE_DEPRECATED 14 - #endif

-22

pkgs/applications/window-managers/compiz/libcompizconfig.nix

··· 1 - { stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }: 2 - 3 - stdenv.mkDerivation rec { 4 - name = "libcompizconfig-0.8.4"; 5 - 6 - src = fetchurl { 7 - url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2"; 8 - sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1"; 9 - }; 10 - 11 - patches = 12 - [ # See ./core.nix. 13 - ./plugindir-libcompizconfig.patch 14 - ]; 15 - 16 - buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ]; 17 - 18 - meta = { 19 - homepage = http://www.compiz.org/; 20 - description = "Compiz configuration library"; 21 - }; 22 - }

-39

pkgs/applications/window-managers/compiz/plugindir-core.patch

··· 1 - diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c 2 - --- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200 3 - +++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200 4 - @@ -146,7 +146,7 @@ 5 - compAddMetadataFromFile (CompMetadata *metadata, 6 - const char *file) 7 - { 8 - - char *home; 9 - + char *home, *metadatadir; 10 - Bool status = FALSE; 11 - 12 - home = getenv ("HOME"); 13 - @@ -163,7 +163,10 @@ 14 - } 15 - } 16 - 17 - - status |= addMetadataFromFilename (metadata, METADATADIR, file); 18 - + metadatadir = getenv("COMPIZ_METADATADIR"); 19 - + if (!metadatadir) metadatadir = METADATADIR; 20 - + 21 - + status |= addMetadataFromFilename (metadata, metadatadir, file); 22 - if (!status) 23 - { 24 - compLogMessage ("core", CompLogLevelWarn, 25 - diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c 26 - --- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200 27 - +++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200 28 - @@ -579,7 +579,10 @@ 29 - } 30 - } 31 - 32 - - status = (*loaderLoadPlugin) (p, PLUGINDIR, name); 33 - + plugindir = getenv("COMPIZ_PLUGINDIR"); 34 - + if (!plugindir) plugindir = PLUGINDIR; 35 - + 36 - + status = (*loaderLoadPlugin) (p, plugindir, name); 37 - if (status) 38 - return p; 39 -

-39

pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch

··· 1 - diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp 2 - --- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200 3 - +++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200 4 - @@ -3004,7 +3004,10 @@ 5 - } 6 - } 7 - 8 - - loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR); 9 - + char *metadatadir = getenv("COMPIZ_METADATADIR"); 10 - + if (!metadatadir) metadatadir = METADATADIR; 11 - + 12 - + loadPluginFromXMLFile (context, xmlName, metadatadir); 13 - free (xmlName); 14 - } 15 - 16 - @@ -3031,7 +3034,10 @@ 17 - free (homeplugins); 18 - } 19 - } 20 - - loadPluginsFromXMLFiles (context, (char *)METADATADIR); 21 - + 22 - + char *metadatadir = getenv("COMPIZ_METADATADIR"); 23 - + if (!metadatadir) metadatadir = METADATADIR; 24 - + loadPluginsFromXMLFiles (context, metadatadir); 25 - 26 - if (home && strlen (home)) 27 - { 28 - @@ -3043,7 +3049,10 @@ 29 - free (homeplugins); 30 - } 31 - } 32 - - loadPluginsFromName (context, (char *)PLUGINDIR); 33 - + 34 - + char *plugindir = getenv("COMPIZ_PLUGINDIR"); 35 - + if (!plugindir) plugindir = PLUGINDIR; 36 - + loadPluginsFromName (context, plugindir); 37 - } 38 - 39 - static void

-30

pkgs/applications/window-managers/compiz/plugins-extra.nix

··· 1 - { stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop 2 - , compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }: 3 - 4 - let version = "0.8.6"; in 5 - 6 - stdenv.mkDerivation rec { 7 - name = "compiz-plugins-extra-${version}"; 8 - 9 - src = fetchurl { 10 - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; 11 - sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1"; 12 - }; 13 - 14 - patches = 15 - [ # Support scaling wallpapers to the maximum size while still 16 - # respecting the aspect ratio. 17 - ./wallpaper-maxpect.patch 18 - ]; 19 - 20 - NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz"; 21 - 22 - buildInputs = 23 - [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ]; 24 - 25 - meta = { 26 - homepage = http://www.compiz.org/; 27 - description = "Extra plugins for Compiz"; 28 - platforms = stdenv.lib.platforms.linux; 29 - }; 30 - }

-22

pkgs/applications/window-managers/compiz/plugins-main.nix

··· 1 - { stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop 2 - , getopt, libjpeg, cairo, pango, gnome }: 3 - 4 - let version = "0.8.6"; in 5 - 6 - stdenv.mkDerivation rec { 7 - name = "compiz-plugins-main-${version}"; 8 - 9 - src = fetchurl { 10 - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; 11 - sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36"; 12 - }; 13 - 14 - buildInputs = 15 - [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ]; 16 - 17 - meta = { 18 - homepage = http://www.compiz.org/; 19 - description = "Main plugins for Compiz"; 20 - platforms = stdenv.lib.platforms.linux; 21 - }; 22 - }

-58

pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch

··· 1 - diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2 - --- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200 3 - +++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200 4 - @@ -24,7 +24,7 @@ 5 - <_long>Image position.</_long> 6 - <type>int</type> 7 - <min>0</min> 8 - - <max>4</max> 9 - + <max>5</max> 10 - <desc> 11 - <value>0</value> 12 - <_name>Scale and Crop</_name> 13 - @@ -45,6 +45,10 @@ 14 - <value>4</value> 15 - <_name>Center Tiled</_name> 16 - </desc> 17 - + <desc> 18 - + <value>5</value> 19 - + <_name>Centered Maxpect</_name> 20 - + </desc> 21 - </option> 22 - <option name="bg_fill_type" type="list"> 23 - <_short>Fill type</_short> 24 - diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c 25 - --- compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c 2010-03-29 16:09:18.000000000 +0200 26 - +++ compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c 2010-10-21 01:09:10.000000000 +0200 27 - @@ -697,12 +697,12 @@ 28 - tmpMatrix = back->imgTex.matrix; 29 - 30 - 31 - - if (back->imagePos == BgImagePosScaleAndCrop) 32 - + if ((back->imagePos == BgImagePosScaleAndCrop) || (back->imagePos == BgImagePosCenteredMaxpect)) 33 - { 34 - s1 = (float) s->width / back->width; 35 - s2 = (float) s->height / back->height; 36 - 37 - - s1 = MAX (s1, s2); 38 - + s1 = back->imagePos == BgImagePosScaleAndCrop ? MAX (s1, s2) : MIN (s1, s2); 39 - 40 - tmpMatrix.xx /= s1; 41 - tmpMatrix.yy /= s1; 42 - @@ -711,6 +711,16 @@ 43 - tmpMatrix.x0 -= x * tmpMatrix.xx; 44 - y = (s->height - ((int)back->height * s1)) / 2.0; 45 - tmpMatrix.y0 -= y * tmpMatrix.yy; 46 - + 47 - + if (back->imagePos == BgImagePosCenteredMaxpect) 48 - + { 49 - + reg = &tmpRegion; 50 - + 51 - + tmpRegion.extents.x1 = MAX (0, x); 52 - + tmpRegion.extents.y1 = MAX (0, y); 53 - + tmpRegion.extents.x2 = MIN (s->width, x + ((int) back->width * s1)); 54 - + tmpRegion.extents.y2 = MIN (s->height, y + ((int) back->height * s1)); 55 - + } 56 - } 57 - else if (back->imagePos == BgImagePosScaled) 58 - {

+30

pkgs/development/tools/misc/intltool/default.nix

··· 1 + {stdenv, fetchurl, perl, perlXMLParser}: 2 + let 3 + s = # Generated upstream information 4 + rec { 5 + baseName="intltool"; 6 + version="0.50.2"; 7 + name="intltool-0.50.2"; 8 + hash="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7"; 9 + url="https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz"; 10 + sha256="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7"; 11 + }; 12 + propagatedBuildInputs = [perl perlXMLParser]; 13 + buildInputs = []; 14 + in 15 + stdenv.mkDerivation rec { 16 + inherit (s) name version; 17 + src = fetchurl { 18 + inherit (s) url sha256; 19 + }; 20 + inherit propagatedBuildInputs buildInputs; 21 + 22 + meta = { 23 + description = "Translation helper tool"; 24 + homepage = "http://launchpad.net/intltool/"; 25 + license = stdenv.lib.licenses.gpl2plus; 26 + maintainers = [stdenv.lib.maintainers.raskin]; 27 + platforms = stdenv.lib.platforms.linux; 28 + inherit (s) version; 29 + }; 30 + }

+1

pkgs/development/tools/misc/intltool/default.upstream

··· 1 + url https://launchpad.net/intltool/+download

+5 -13

pkgs/top-level/all-packages.nix

··· 3987 3987 iniparser = callPackage ../development/libraries/iniparser { }; 3988 3988 3989 3989 intltool = gnome.intltool; 3990 + intltool_standalone = callPackage ../development/tools/misc/intltool {}; 3990 3991 3991 3992 irrlicht3843 = callPackage ../development/libraries/irrlicht { }; 3992 3993 ··· 6690 6691 6691 6692 cmus = callPackage ../applications/audio/cmus { }; 6692 6693 6693 - compiz = callPackage ../applications/window-managers/compiz/core.nix { }; 6694 - 6695 - compiz_ccsm = callPackage ../applications/window-managers/compiz/ccsm.nix { }; 6696 - 6697 - compizconfig_python = callPackage ../applications/window-managers/compiz/config-python.nix { }; 6694 + compiz = callPackage ../applications/window-managers/compiz { 6695 + inherit (gnome) GConf ORBit2; 6696 + intltool = intltool_standalone; 6697 + }; 6698 6698 6699 6699 coriander = callPackage ../applications/video/coriander { 6700 6700 inherit (gnome) libgnomeui GConf; 6701 6701 }; 6702 6702 6703 6703 csound = callPackage ../applications/audio/csound { }; 6704 - 6705 - libcompizconfig = callPackage ../applications/window-managers/compiz/libcompizconfig.nix { }; 6706 - 6707 - compiz_bcop = callPackage ../applications/window-managers/compiz/bcop.nix { }; 6708 - 6709 - compiz_plugins_main = callPackage ../applications/window-managers/compiz/plugins-main.nix { }; 6710 - 6711 - compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { }; 6712 6704 6713 6705 cinepaint = callPackage ../applications/graphics/cinepaint { 6714 6706 fltk = fltk13;