diff options
Diffstat (limited to 'pkgs/applications')
47 files changed, 545 insertions, 376 deletions
diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix new file mode 100644 index 000000000000..86ffca4242fa --- /dev/null +++ b/pkgs/applications/audio/mp3info/default.nix @@ -0,0 +1,42 @@ +{ fetchurl, stdenv, ncurses, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + name = "mp3info-0.8.5a"; + + src = fetchurl { + url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/${name}.tgz"; + sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; + }; + + buildInputs = [ ncurses pkgconfig gtk ]; + + configurePhase = + '' sed -i Makefile \ + -e "s|^prefix=.*$|prefix=$out|g ; + s|/bin/rm|rm|g ; + s|/usr/bin/install|install|g" + ''; + + preInstall = + '' ensureDir "$out/bin" + ensureDir "$out/man/man1" + ''; + + meta = { + description = "MP3Info, an MP3 technical info viewer and ID3 1.x tag editor"; + + longDescription = + '' MP3Info is a little utility used to read and modify the ID3 tags of + MP3 files. MP3Info can also display various techincal aspects of an + MP3 file including playing time, bit-rate, sampling frequency and + other attributes in a pre-defined or user-specifiable output format. + ''; + + homepage = http://www.ibiblio.org/mp3info/; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index 4dbf8663f15d..3a9770314366 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, emacs, texinfo -, mpg321, vorbisTools, taglib, alsaUtils }: +, mpg321, vorbisTools, taglib, mp3info, alsaUtils }: # XXX: EMMS also supports Xine, MPlayer, Jack, etc. @@ -36,12 +36,18 @@ stdenv.mkDerivation rec { # Use the libtag info back-end for MP3s since we're building it. sed -i "emms-setup.el" \ -e 's|emms-info-mp3info|emms-info-libtag|g' + + # But use mp3info for the tag editor. + sed -i "emms-info-mp3info.el" \ + -e 's|emms-info-mp3info-program-name[[:blank:]]\+"mp3info"|emms-info-mp3info-program-name "${mp3info}/bin/mp3info"|g' + sed -i "emms-tag-editor.el" \ + -e 's|"mp3info"|"${mp3info}/bin/mp3info"|g' ''; postInstall = '' ensureDir "$out/bin" && cp emms-print-metadata "$out/bin" ''; - + meta = { description = "GNU EMMS, The Emacs Multimedia System"; @@ -57,6 +63,10 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/emms/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 3d7fef640ca4..c9d3cf7b7ef7 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, help2man }: stdenv.mkDerivation rec { - name = "zile-2.3.19"; + name = "zile-2.3.20"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "1c2by5d5d1nmap3wc55giscsj47xx16viv7b07c6c4nssnlniszs"; + sha256 = "0y07bkb7ypvsnz8ly7w274489icxw5z5hy6z50mx1nywkv2whd3q"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a126402cadf2..6d4431516f8e 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -3,17 +3,21 @@ kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, liblqr1, lensfun, pkgconfig }: stdenv.mkDerivation rec { - name = "digikam-1.4.0"; + name = "digikam-1.5.0"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "1fky4jkji9fkhzzvw7wic6xy7vkj9g39hx1xm76qxxq8i2nzlynk"; + sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz"; }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun pkgconfig ]; + KDEDIRS=kdeedu; + + patches = [ ./include.diff ]; + meta = { description = "Photo Management Program"; license = "GPL"; diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff new file mode 100644 index 000000000000..0762ce04d263 --- /dev/null +++ b/pkgs/applications/graphics/digikam/include.diff @@ -0,0 +1,12 @@ +diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt +index 9ee36cc..c6e5c00 100644 +--- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt ++++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt +@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS) + + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/ + ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/ ++ ${LIBMARBLEWIDGET_INCLUDE_DIR}/.. + ${QT_INCLUDE_DIR} + ) + diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index 22174333a4d0..c3fe93a77ea8 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -2,11 +2,11 @@ kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }: stdenv.mkDerivation rec { - name = "kipi-plugins-1.4.0"; + name = "kipi-plugins-1.5.0"; src = fetchurl { url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34"; + sha256 = "1wsqh0lbsqyzdfmb9f53bmmypw00n80p62ym4pnxb8w0zwlhbkbw"; }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 77120a838f50..7e2a12adb018 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv, -libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, +libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4, zlib }: /* I haven't found any x86_64 package from them */ assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "googleearth-5.1.3535.3218"; + name = "googleearth-5.2.0001"; src = fetchurl { url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin; - sha256 = "f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac"; + sha256 = "2e6fcbd2384446e2a6eed8ca23173e32c5f3f9ae4d1168e2e348c3924fd2bf30"; }; buildNativeInputs = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation { freetype libXext libX11 + qt4 zlib ]; diff --git a/pkgs/applications/misc/k3b/1.0.nix b/pkgs/applications/misc/k3b/1.0.nix new file mode 100644 index 000000000000..7ac483cedea7 --- /dev/null +++ b/pkgs/applications/misc/k3b/1.0.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}: + +stdenv.mkDerivation { + name = "k3b-1.0.5"; + + src = fetchurl { + url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2; + sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl"; + }; + + buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3]; + + configureFlags = "--without-arts"; + + meta = { + description = "A CD and DVD authoring application for KDE"; + homepage = http://www.k3b.org/; + }; +} diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 9f6f4d14c111..756adb03f75d 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,19 +1,29 @@ -{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}: +{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib +, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext +, kdelibs, kdemultimedia, cdrdao, cdrtools, dvdplusrwtools +, automoc4, phonon, makeWrapper +}: -stdenv.mkDerivation { - name = "k3b-1.0.5"; - +stdenv.mkDerivation rec { + name = "k3b-2.0.1"; src = fetchurl { - url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2; - sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl"; + url = "mirror://sourceforge/k3b/${name}.tar.bz2"; + sha256 = "1dyd3i2hqd5xs9rz4f8k74zca91j9sp72lhl0zws2cvqc474ccc6"; }; - - buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3]; - configureFlags = "--without-arts"; + buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib + ffmpeg flac libsamplerate libdvdread lame libsndfile + libmad gettext stdenv.gcc.libc cdrdao cdrtools + kdelibs kdemultimedia automoc4 phonon dvdplusrwtools + makeWrapper ]; - meta = { - description = "A CD and DVD authoring application for KDE"; - homepage = http://www.k3b.org/; + postInstall = '' + wrapProgram $out/bin/k3b --suffix PATH : "${cdrdao}/bin:${dvdplusrwtools}/bin:${cdrtools}/bin" + ''; + + meta = with stdenv.lib; { + description = "CD/DVD Burning Application for KDE"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sander maintainers.urkud ]; }; } diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 9e9c04acab29..3286c8addb3b 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,17 +1,16 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}: +{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kdebase, automoc4, phonon}: -stdenv.mkDerivation { - name = "krusader-2.0.0"; +stdenv.mkDerivation rec { + name = "krusader-2.2.0-beta1"; src = fetchurl { - url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz; - sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c"; + url = "mirror://sourceforge/krusader/${name}.tar.bz2"; + sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs"; }; - buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ]; - patches = [./krusader-gcc44.patch]; + buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kdebase ]; meta = { description = "Norton/Total Commander clone for KDE"; license = "GPL"; homepage = http://www.krusader.org; - maintainers = [ lib.maintainers.sander ]; + maintainers = with stdenv.lib.maintainers; [ sander urkud ]; }; } diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index e341ae6cd055..5a0c5fc12734 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/-Werror//' -i configure - sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure - sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure - sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure + sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure + sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure + sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include" diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix index 9a778a6f6937..497d2adfd2c2 100644 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ b/pkgs/applications/misc/xneur/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.9.9"; - name="xneur-0.9.9"; - hash="07ircm7ngc84h6fpy8q01444vy9cm08q4mbl3q3ya0dg00cq64z4"; + version="0.10.0"; + name="xneur-0.10.0"; + hash="1jh40awnc5bvdj07jv99ymiln8nzr5ac5ahz9v4w0m560b7qq48f"; url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.9.9/tgz/xneur-0.9.9.tar.bz2"; + advertisedUrl="http://dists.xneur.ru/release-0.10.0/tgz/xneur-0.10.0.tar.bz2"; } diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index 1e22e263c86a..d812078b6aad 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "arora-${version}"; - version = "0.10.2"; + version = "0.11.0"; src = fetchurl { url = "http://arora.googlecode.com/files/${name}.tar.gz"; - sha256 = "1np9xiy7vkpz4dar6ka90wxw4nkwapjafyjzqrv7ghnc3nqdnnvv"; + sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1a74135c1041..5899386e8813 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -34,20 +34,18 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { - name = "chrome-${version}"; # !!! Shouldn't this be "chromium"? - version = "61624"; - - # TODO: Use a stable release that doesn't disappear every few days. + name = "chrome-${version}"; + version = "62263"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip"; - sha256 = "16kv1zbs3ypb2b00dpg2s4nn8zqdnv8jdvgxknp3s0xcq02w2asl"; + sha256 = "0yn52bqxadwnzi04gfg0ginrvwz18wchqgcl701s7n4i5xzdnmv8"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; - sha256 = "081pvwzpys98m3arj3qagyhrrphz7rjwn7yy4mk6bcrds6mwdxiz"; + sha256 = "1cbzd4k9m1hf08462him8jqxw13k0wy0q1rpq84niifsqnq4z8nx"; } else throw "Chromium is not supported on this platform."; diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index fe393c428d18..4776419c8069 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6.10"; + firefoxVersion = "3.6.11"; - xulVersion = "1.9.2.10"; # this attribute is used by other packages + xulVersion = "1.9.2.11"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "0fa17f4ebd4bafe18c789961bdfe064d1b521ac6"; + sha1 = "d5443a07243a771fb4c69c08cd6a0f5320a888c4"; }; diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/4.0.nix index 3a441193811a..af6224475555 100644 --- a/pkgs/applications/networking/browsers/firefox/4.0.nix +++ b/pkgs/applications/networking/browsers/firefox/4.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, libvpx, yasm, mesa +, libvpx, yasm, mesa, wirelesstools , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -52,6 +52,8 @@ rec { python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa + wirelesstools xlibs.libXscrnsaver xlibs.scrnsaverproto + xlibs.libXext xlibs.xextproto ]; configureFlags = @@ -105,7 +107,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman libvpx yasm mesa + xlibs.pixman libvpx yasm mesa wirelesstools ]; propagatedBuildInputs = [xulrunner]; diff --git a/pkgs/applications/networking/browsers/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix index 7b2a585e4653..815e1a16964c 100644 --- a/pkgs/applications/networking/browsers/konq-plugins/default.nix +++ b/pkgs/applications/networking/browsers/konq-plugins/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ]; + patches = [ ./qt47.patch ]; + meta = with stdenv.lib; { description = "Various plugins for Konqueror"; license = "GPL"; diff --git a/pkgs/applications/networking/browsers/konq-plugins/qt47.patch b/pkgs/applications/networking/browsers/konq-plugins/qt47.patch new file mode 100644 index 000000000000..2039d293eb32 --- /dev/null +++ b/pkgs/applications/networking/browsers/konq-plugins/qt47.patch @@ -0,0 +1,11 @@ +--- konq-plugins/adblock/adblock.cpp 2010-02-11 22:12:41.000000000 +0000 ++++ konq-plugins/adblock/adblock.cpp 2010-07-26 17:12:20.639786002 +0100 +@@ -300,7 +300,7 @@ + // ---------------------------------------------------------------------------- + + AdElement::AdElement() : +- m_url(0), m_category(0), m_type(0), m_blocked(false) {} ++ m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {} + + AdElement::AdElement(const QString &url, const QString &category, + const QString &type, bool blocked, const DOM::Node&node) : diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 60f2162a26a3..f9b8061d5ebd 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl -, gtk, gettext, pixman}: +, gettext}: stdenv.mkDerivation rec { - name = "rekonq-0.5.0"; + name = "rekonq-0.6.1"; + passthru = { inherit stdenv; }; src = fetchurl { url = "mirror://sf/rekonq/${name}.tar.bz2"; - sha256 = "0qm16ivxlh3pj7v39z3ajf90sgm5q5xq6a8s2x1a0ipsh7fgkp58"; + sha256 = "1hgy8ph4k4ngdy1kr4w3qwkfdylapsj7rjpk8wxn97yc4qnk57by"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gtk gettext pixman ]; + buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gettext ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9d290224c42e..691a6d097346 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation { - name = "pidgin-2.7.3"; + name = "pidgin-2.7.4"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.7.3.tar.bz2; - sha256 = "1wi3wckn3gkbrgx0kk1b690nxj1i4xcp3xn5wrra6gwcgfm8hmwb"; + url = mirror://sourceforge/pidgin/pidgin-2.7.4.tar.bz2; + sha256 = "0mpqh77g5wgi39bqi4hma4z7r3piz3wi8x49s3dy5gc2220s4vvw"; }; inherit nss ncurses; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 5d5aed592fd5..a08cc2795bbb 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -28,7 +28,12 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doQMake" "doMakeInstall"]; + phaseNames = ["preBuild" "doQMake" "doMakeInstall"]; + + preBuild = a.fullDepEntry ('' + echo "Fixing a name collision with a function added in Qt 4.7" + sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp + '') ["minInit" "doUnpack"]; goSrcDir = ''cd vacuum-*/''; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fc0638b62e47..9478ad74c989 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { postInstall = '' ensureDir $out/share/emacs/site-lisp - cp contrib/client-side/emacs/*.el $out/share/emacs/site-lisp/ + cp contrib/client-side/emacs/[dp]svn*.el $out/share/emacs/site-lisp/ if test -n "$pythonBindings"; then make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { make install cd - fi - ''; # */ + ''; inherit perlBindings pythonBindings; diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index 097bb5974aa4..67fafdee7513 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.3.1.10304"; - name="veracity-0.3.1.10304"; - hash="0izbs3v7incy9799sh6idfy7r2mchq2v152k8qc1k5l2r1jq4vik"; + version="0.5.0.10311"; + name="veracity-0.5.0.10311"; + hash="0ad30x8dbxrqz6d9jmq40rzkhx4z4mgbqb37zszh8bcf9v69kv6z"; url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10304.tar.gz"; + advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.0.10311.tar.gz"; } diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index aaa83ccc1449..5f2e905efa09 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto}: +{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: stdenv.mkDerivation { name = "xawtv-3.95"; @@ -6,7 +6,10 @@ stdenv.mkDerivation { url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz; md5 = "ad25e03f7e128b318e392cb09f52207d"; }; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${linux}/lib/modules/*/build/include)" + ''; buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE perl xextproto]; - patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch]; + patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch ./xawtv-3.95-page-mask.patch ]; } diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch b/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch new file mode 100644 index 000000000000..5714e8238e67 --- /dev/null +++ b/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch @@ -0,0 +1,44 @@ +Fix problems with fbtv and kernel headers + +diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c +--- xawtv-3.95/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000 ++++ xawtv-3.95/console/fbtools.c 2006-08-23 10:57:40.000000000 +0000 +@@ -21,8 +21,6 @@ + #include <linux/vt.h> + #include <linux/fb.h> + +-#include <asm/page.h> +- + #include "fbtools.h" + + /* -------------------------------------------------------------------- */ +@@ -424,7 +422,7 @@ + goto err; + } + #endif +- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK); ++ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1); + fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset, + PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); + if (-1L == (long)fb_mem) { +diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c +--- xawtv-3.95/console/matrox.c 2005-02-03 10:40:41.000000000 +0000 ++++ xawtv-3.95/console/matrox.c 2006-08-23 11:09:51.000000000 +0000 +@@ -9,7 +9,6 @@ + #include <sys/ioctl.h> + #include <sys/mman.h> + +-#include <asm/page.h> /* PAGE_SIZE */ + #include <linux/fb.h> + + #include "byteswap.h" +@@ -226,7 +225,7 @@ + return -1; + } + off = (unsigned long)fb_fix.mmio_start - +- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); ++ ((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1)); + bmmio += off; + mmio = (uint32_t*)bmmio; + return 0; + diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix deleted file mode 100644 index 07ba60cd8333..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix +++ /dev/null @@ -1,34 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2; - sha256 ="1rs5r5b6rl39vlw68i8bwm5izs5dm666kygmg1c8dy2dab0xsnkq"; - }; - buildInputs = (import ../general-dependencies.nix args); - propagatedBuildInputs = [getopt libxslt]; - configureFlags = []; - } ; - in with localDefs; -let - fixPkgconfig = fullDepEntry (" - ensureDir \$out/lib - ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig - ") [minInit doMakeInstall defEnsureDir]; - fixInterpreter = fullDepEntry (" - sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop - ") [minInit doMakeInstall]; -in -stdenv.mkDerivation rec { - name = "compiz-bcop-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare - doPropagate]); - inherit propagatedBuildInputs; - meta = { - description = " - Compiz BCOP. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix deleted file mode 100644 index d739b54a5341..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2; - sha256 ="0djdzz1m9nvwzxfaywdm90bi816nig2ybfynf48394a5hpsng3l9"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [libcompizconfig bcop compizConfigPython python gettext pygtk - pycairo configBackendGConf]; - configureFlags = []; - wrappedEnv = [ - "PYTHONPATH" "$(toPythonPath \$out)" - "PYTHONPATH" "\$PYTHONPATH" - "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" - ]; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-settings-"+args.version; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage (doWrap "\$out/bin/simple-ccsm")]); - meta = { - description = " - Compiz Settings Manager (simplified) -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix deleted file mode 100644 index 385819afd4c3..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2; - sha256 ="0s8difywj0ghc8c5xjxihfp8qhlhv5kyh00c2br1jh2ap5rrdfgc"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [libcompizconfig bcop compizConfigPython python gettext pygtk - pycairo configBackendGConf]; - configureFlags = []; - wrappedEnv = [ - "PYTHONPATH" "$(toPythonPath \$out)" - "PYTHONPATH" "\$PYTHONPATH" - "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" - ]; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-settings-"+args.version; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage (doWrap "\$out/bin/ccsm")]); - meta = { - description = " - Compiz Settings Manager -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix deleted file mode 100644 index d92349e238b2..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix +++ /dev/null @@ -1,23 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2; - sha256 ="13g8vpgkimrbp19pd475ijiwbqx3zin0nzq8636l71yaqb0kjfjn"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [libcompizconfig bcop python pyrex configBackendGConf]; - configureFlags = []; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-python-"+args.version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]); - meta = { - description = " - Compiz configuration - Python part. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix deleted file mode 100644 index f6f1f1545b03..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix +++ /dev/null @@ -1,24 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2; - sha256 ="18bcfx3c2ipj3spfr8dg07h98pw77jh28w91w6n2fd5ffr6ja9q5"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [bcop libcompizconfig]; - configureFlags = []; - forceShare = ["man" "doc" "info" "lib/compizconfig"]; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-backend-GConf-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare doPropagate]); - meta = { - description = " - Compiz configuration backend (GConf). -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/default.nix b/pkgs/applications/window-managers/compiz-fusion/default.nix deleted file mode 100644 index bfd0810facf0..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -args : with args; -rec -{ - selectVersion = dir: import (dir + "/${args.version}.nix"); - bcop = selectVersion ./bcop args; - libcompizconfig = selectVersion ./libcompizconfig (args // {inherit bcop;}); - configBackendGConf = selectVersion ./config-backend (args // {inherit bcop libcompizconfig;}); - compizConfigPython = selectVersion ./compizconfig-python (args // {inherit libcompizconfig - bcop pyrex configBackendGConf;}); - ccsm = selectVersion ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); - pluginsMain = selectVersion ./main (args //{inherit bcop ;}); - pluginsExtra = selectVersion ./extra (args //{inherit bcop pluginsMain;}); - compizManager = (import ./compiz-manager/0.6.0.nix) (args // {inherit bcop ccsm;}); - ccsmSimple = selectVersion ./ccsm-simple (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); -} diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix deleted file mode 100644 index 7ea173e15611..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix +++ /dev/null @@ -1,32 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2; - sha256 ="0hdnabq1bxln5cf6k9532iszj5qbhwkyl3b5d1gwfr80i01qxzy9"; - }; - buildInputs = (import ../general-dependencies.nix args)++ - [bcop libjpeg gettext pluginsMain]; - configureFlags = []; - } ; - in with localDefs; -let - sharePlugins = fullDepEntry (" - ensureDir \$out/share/compiz-plugins - ln -vsf \$out/lib/compiz \$out/share/compiz-plugins - ") [minInit doMakeInstall defEnsureDir]; - fixIncludes = fullDepEntry ('' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz" - '') [minInit doUnpack]; -in -stdenv.mkDerivation rec { - name = "compiz-fusion-plugins-extra-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]); - meta = { - description = " - Extra Compiz Fusion plugins. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix b/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix deleted file mode 100644 index f83ae7d1c8bf..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix +++ /dev/null @@ -1,10 +0,0 @@ -/* Ubuntu dependencies -build-essential libxcomposite-dev libpng12-dev libsm-dev libxrandr-dev libxdamage-dev libxinerama-dev libstartup-notification0-dev libgconf2-dev libgl1-mesa-dev libglu1-mesa-dev libmetacity-dev librsvg2-dev libdbus-1-dev libdbus-glib-1-dev libgnome-desktop-dev libgnome-window-settings-dev gitweb curl autoconf automake automake1.9 libtool intltool libxslt1-dev xsltproc libwnck-dev -*/ -args: with args; -[ - libpng - GConf mesa metacity librsvg dbus.libs dbus_glib gnomedesktop git autoconf automake - libtool libxslt libwnck intltool perl perlXMLParser compiz pkgconfig libxml2 - gettext -] diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix deleted file mode 100644 index 0ea38bd45202..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix +++ /dev/null @@ -1,23 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2; - sha256 ="1026icgzyjxnn68gbkd85n9p8pxlwbc3h0dqqvpqmr93q1nhdmjr"; - }; - buildInputs = (import ../general-dependencies.nix args)++ - [bcop]; - configureFlags = []; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "libcompizconfig-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doIntltool doAutotools doConfigure doMakeInstall doForceShare]); - meta = { - description = " - Compiz configuration backend library. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix deleted file mode 100644 index fd4bb896c0ce..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2; - sha256 ="0lrvqi8kc8m6yap8pqbdg0wksckd3v3rp3k48q82pyvcwhaaf817"; - }; - buildInputs = (import ../general-dependencies.nix args)++ - [bcop libjpeg gettext]; - configureFlags = []; - } ; - in with localDefs; -let - sharePlugins = fullDepEntry (" - ensureDir \$out/share/compiz-plugins - ln -vsf \$out/lib/compiz \$out/share/compiz-plugins - ") [minInit doMakeInstall defEnsureDir]; -in -stdenv.mkDerivation rec { - name = "compiz-fusion-plugins-main-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doConfigure doMakeInstall sharePlugins doForceShare]); - meta = { - description = " - Main Compiz Fusion plugins. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz/0.8.0.nix b/pkgs/applications/window-managers/compiz/0.8.0.nix deleted file mode 100644 index 40215b2b5495..000000000000 --- a/pkgs/applications/window-managers/compiz/0.8.0.nix +++ /dev/null @@ -1,44 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = "http://releases.compiz-fusion.org/core/compiz-0.8.0.tar.gz"; - sha256 = "0xhyilfz2cfbdwni774b54171addjqw7hda6j6snzxb1igny7iry"; - }; - - buildInputs = [ - pkgconfig gtk libwnck GConf libgnome - libgnomeui metacity gnomegtk glib pango libglade libgtkhtml - gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel - librsvg fuse gettext intltool binutils - ]; - propagatedBuildInputs = [ - libpng libXcomposite libXfixes libXdamage libXrandr libXinerama - libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt - dbus.libs dbus_glib compositeproto fixesproto damageproto randrproto - xineramaproto renderproto kbproto xextproto libXrender xproto libX11 - libxcb - ]; - - postAll = fullDepEntry (" - for i in $out/bin/*; do - patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i - done - ensureDir \$out/share/compiz-plugins/ - ln -sfv \$out/lib/compiz \$out/share/compiz-plugins/ - ") ["minInit" "doMakeInstall" "defEnsureDir"]; - - configureFlags = ["--enable-gtk" "--enable-fuse" - "--enable-annotate" "--enable-librsvg"] ++ - (if args ? extraConfigureFlags then args.extraConfigureFlags else []); - - /* doConfigure should be specified separately */ - phaseNames = [ "doPatch" "doConfigure" "doMakeInstall" "doPropagate" - "doForceShare" "postAll" ]; - - name = "compiz-0.8.0"; - - meta = { - description = "Compiz window manager"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz/bcop.nix b/pkgs/applications/window-managers/compiz/bcop.nix new file mode 100644 index 000000000000..254393d4c7fc --- /dev/null +++ b/pkgs/applications/window-managers/compiz/bcop.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, libxslt }: + +stdenv.mkDerivation rec { + name = "compiz-bcop-0.8.4"; + + src = fetchurl { + url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2"; + sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk"; + }; + + buildInputs = [ pkgconfig libxslt ]; + + meta = { + homepage = http://www.compiz.org/; + description = "Code generator for Compiz plugins"; + }; +} diff --git a/pkgs/applications/window-managers/compiz/ccsm.nix b/pkgs/applications/window-managers/compiz/ccsm.nix new file mode 100644 index 000000000000..0406a170d190 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/ccsm.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, makeWrapper, intltool, gtk +, python, pygtk, pygobject, pycairo, compizconfig_python }: + +stdenv.mkDerivation rec { + name = "ccsm-0.8.4"; + + src = fetchurl { + url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2"; + sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6"; + }; + + buildInputs = [ makeWrapper python intltool gtk ]; + + buildPhase = "python setup.py build --prefix=$out"; + + pythonDeps = [ pygtk pygobject pycairo compizconfig_python ]; + + installPhase = + '' + python setup.py install --prefix=$out + + wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \ + "$(toPythonPath "$pythonDeps $out")" + ''; + + meta = { + homepage = http://www.compiz.org/; + description = "Compiz settings manager"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/compiz/config-python.nix b/pkgs/applications/window-managers/compiz/config-python.nix new file mode 100644 index 000000000000..4de7fb41a488 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/config-python.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib +, python, pyrex }: + +stdenv.mkDerivation rec { + name = "compizconfig-python-0.8.4"; + + src = fetchurl { + url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2"; + sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37"; + }; + + buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ]; + + NIX_LDFLAGS = "-lcompizconfig"; + + meta = { + homepage = http://www.compiz.org/; + description = "Python interface to the Compiz configuration"; + }; +} diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix new file mode 100644 index 000000000000..ef5279613d09 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/core.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt +, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }: + +let version = "0.8.6"; in + +stdenv.mkDerivation { + name = "compiz-${version}"; + + src = fetchurl { + url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2"; + sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4"; + }; + + patches = + [ # Allow the path to the Compiz plugin library and metadata + # directories to be overriden through $COMPIZ_PLUGINDIR and + # $COMPIZ_METADATADIR, respectively. + ./plugindir-core.patch + ]; + + buildInputs = + [ intltool pkgconfig libpng glib + gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2 + ]; + + propagatedBuildInputs = + [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender + xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama + libstartup_notification mesa libxml2 libxslt + ]; + + meta = { + homepage = http://www.compiz.org/; + description = "A compositing window manager"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/compiz/extra.nix b/pkgs/applications/window-managers/compiz/extra.nix deleted file mode 100644 index 70f4e5dd8c38..000000000000 --- a/pkgs/applications/window-managers/compiz/extra.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, compiz, perl, perlXMLParser, GConf, dbus, gtk -}: - -stdenv.mkDerivation { - name = "compiz-extra-20070305"; - src = fetchurl { - url = http://gandalfn.club.fr/ubuntu/compiz-extra/compiz-extra-latest.tar.bz2; - sha256 = "7fc7faafccfdf22dea7ac1de6629dcb55ec63d84fcb57a14559309cf284fa94f"; - }; - buildInputs = [ - pkgconfig compiz perl perlXMLParser GConf dbus.libs gtk - ]; - preBuild = " - makeFlagsArray=(moduledir=$out/lib/compiz) - "; - preConfigure = "touch m4/Makefile.in"; -} diff --git a/pkgs/applications/window-managers/compiz/libcompizconfig.nix b/pkgs/applications/window-managers/compiz/libcompizconfig.nix new file mode 100644 index 000000000000..51d459e7a366 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/libcompizconfig.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }: + +stdenv.mkDerivation rec { + name = "libcompizconfig-0.8.4"; + + src = fetchurl { + url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2"; + sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1"; + }; + + patches = + [ # See ./core.nix. + ./plugindir-libcompizconfig.patch + ]; + + buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ]; + + meta = { + homepage = http://www.compiz.org/; + description = "Compiz configuration library"; + }; +} diff --git a/pkgs/applications/window-managers/compiz/plugindir-core.patch b/pkgs/applications/window-managers/compiz/plugindir-core.patch new file mode 100644 index 000000000000..5a242e66088f --- /dev/null +++ b/pkgs/applications/window-managers/compiz/plugindir-core.patch @@ -0,0 +1,39 @@ +diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c +--- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200 ++++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200 +@@ -146,7 +146,7 @@ + compAddMetadataFromFile (CompMetadata *metadata, + const char *file) + { +- char *home; ++ char *home, *metadatadir; + Bool status = FALSE; + + home = getenv ("HOME"); +@@ -163,7 +163,10 @@ + } + } + +- status |= addMetadataFromFilename (metadata, METADATADIR, file); ++ metadatadir = getenv("COMPIZ_METADATADIR"); ++ if (!metadatadir) metadatadir = METADATADIR; ++ ++ status |= addMetadataFromFilename (metadata, metadatadir, file); + if (!status) + { + compLogMessage ("core", CompLogLevelWarn, +diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c +--- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200 ++++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200 +@@ -579,7 +579,10 @@ + } + } + +- status = (*loaderLoadPlugin) (p, PLUGINDIR, name); ++ plugindir = getenv("COMPIZ_PLUGINDIR"); ++ if (!plugindir) plugindir = PLUGINDIR; ++ ++ status = (*loaderLoadPlugin) (p, plugindir, name); + if (status) + return p; + 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 diff --git a/pkgs/applications/window-managers/compiz/plugins-extra.nix b/pkgs/applications/window-managers/compiz/plugins-extra.nix new file mode 100644 index 000000000000..8852ebd474ed --- /dev/null +++ b/pkgs/applications/window-managers/compiz/plugins-extra.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop +, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }: + +let version = "0.8.6"; in + +stdenv.mkDerivation rec { + name = "compiz-plugins-extra-${version}"; + + src = fetchurl { + url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; + sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1"; + }; + + patches = + [ # Support scaling wallpapers to the maximum size while still + # respecting the aspect ratio. + ./wallpaper-maxpect.patch + ]; + + NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz"; + + buildInputs = + [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ]; + + meta = { + homepage = http://www.compiz.org/; + description = "Extra plugins for Compiz"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/compiz/plugins-main.nix b/pkgs/applications/window-managers/compiz/plugins-main.nix new file mode 100644 index 000000000000..ea1c01e7414b --- /dev/null +++ b/pkgs/applications/window-managers/compiz/plugins-main.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop +, getopt, libjpeg, cairo, pango, gnome }: + +let version = "0.8.6"; in + +stdenv.mkDerivation rec { + name = "compiz-plugins-main-${version}"; + + src = fetchurl { + url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; + sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36"; + }; + + buildInputs = + [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ]; + + meta = { + homepage = http://www.compiz.org/; + description = "Main plugins for Compiz"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch new file mode 100644 index 000000000000..8130dff1dba4 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch @@ -0,0 +1,58 @@ +diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in +--- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200 ++++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200 +@@ -24,7 +24,7 @@ + <_long>Image position.</_long> + <type>int</type> + <min>0</min> +- <max>4</max> ++ <max>5</max> + <desc> + <value>0</value> + <_name>Scale and Crop</_name> +@@ -45,6 +45,10 @@ + <value>4</value> + <_name>Center Tiled</_name> + </desc> ++ <desc> ++ <value>5</value> ++ <_name>Centered Maxpect</_name> ++ </desc> + </option> + <option name="bg_fill_type" type="list"> + <_short>Fill type</_short> +diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c +--- compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c 2010-03-29 16:09:18.000000000 +0200 ++++ compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c 2010-10-21 01:09:10.000000000 +0200 +@@ -697,12 +697,12 @@ + tmpMatrix = back->imgTex.matrix; + + +- if (back->imagePos == BgImagePosScaleAndCrop) ++ if ((back->imagePos == BgImagePosScaleAndCrop) || (back->imagePos == BgImagePosCenteredMaxpect)) + { + s1 = (float) s->width / back->width; + s2 = (float) s->height / back->height; + +- s1 = MAX (s1, s2); ++ s1 = back->imagePos == BgImagePosScaleAndCrop ? MAX (s1, s2) : MIN (s1, s2); + + tmpMatrix.xx /= s1; + tmpMatrix.yy /= s1; +@@ -711,6 +711,16 @@ + tmpMatrix.x0 -= x * tmpMatrix.xx; + y = (s->height - ((int)back->height * s1)) / 2.0; + tmpMatrix.y0 -= y * tmpMatrix.yy; ++ ++ if (back->imagePos == BgImagePosCenteredMaxpect) ++ { ++ reg = &tmpRegion; ++ ++ tmpRegion.extents.x1 = MAX (0, x); ++ tmpRegion.extents.y1 = MAX (0, y); ++ tmpRegion.extents.x2 = MIN (s->width, x + ((int) back->width * s1)); ++ tmpRegion.extents.y2 = MIN (s->height, y + ((int) back->height * s1)); ++ } + } + else if (back->imagePos == BgImagePosScaled) + { |