From 2c7ac76079fb49049b9c51fd4755e129c233d210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Jan 2012 14:01:17 +0000 Subject: [PATCH 01/11] unclutter: X cursor management tool Unclutter hides your X mouse cursor when you do not need it, to prevent it from getting in the way. You have only to move the mouse to restore the mouse cursor. Unclutter is very usefull in tiling wm's where you do not need the mouse often. Just run it from your .bash_profile like that: unclutter -idle 1 & svn path=/nixpkgs/trunk/; revision=31431 --- pkgs/tools/misc/unclutter/default.nix | 32 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/unclutter/default.nix diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix new file mode 100644 index 00000000000..8cf31ff7208 --- /dev/null +++ b/pkgs/tools/misc/unclutter/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, x11}: + +stdenv.mkDerivation { + name = "unclutter-8"; + src = fetchurl { + url = http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; + sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; + }; + + buildInputs = [x11]; + + installPhase = '' + mkdir -pv "$out/bin" + mkdir -pv "$out/share/man/man1" + make DESTDIR="$out" BINDIR="$out/bin" PREFIX="" install + make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man + ''; + + meta = { + description = "Hides mouse pointer while not in use."; + longDescription = '' + Unclutter hides your X mouse cursor when you do not need it, to prevent + it from getting in the way. You have only to move the mouse to restore + the mouse cursor. Unclutter is very usefull in tiling wm's where you do + not need the mouse often. + + Just run it from your .bash_profile like that: + + unclutter -idle 1 & + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3164ea8984d..bb9ff86089c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1506,6 +1506,8 @@ let ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; + unclutter = callPackage ../tools/misc/unclutter { }; + unbound = callPackage ../tools/networking/unbound { }; units = callPackage ../tools/misc/units { }; From 65715f2e98b29d000ad5ee76fc247c1d4292bed3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Jan 2012 14:43:21 +0000 Subject: [PATCH 02/11] all-packages.nix: let 'python3' refer to the latest version, python 3.2 svn path=/nixpkgs/trunk/; revision=31432 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb9ff86089c..896b62fad99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2661,12 +2661,13 @@ let pure = callPackage ../development/interpreters/pure {}; python = python27; + python3 = python32; python26 = callPackage ../development/interpreters/python/2.6 { }; python27 = callPackage ../development/interpreters/python/2.7 { }; - python3 = callPackage ../development/interpreters/python/3.1 { + python31 = callPackage ../development/interpreters/python/3.1 { arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null; sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null; }; From bfd6c7fa3eb427e10472b030144108e77b3d4d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 8 Jan 2012 15:41:17 +0000 Subject: [PATCH 03/11] GNU Automake 1.11.x: Disable tests on FreeBSD. svn path=/nixpkgs/trunk/; revision=31433 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 896b62fad99..fe3f8e57669 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2824,7 +2824,10 @@ let automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { doCheck = !stdenv.isArm && !stdenv.isCygwin # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. - && stdenv.system != "i686-solaris"; + && stdenv.system != "i686-solaris" + + # One test fails to terminate on FreeBSD: . + && !stdenv.isFreeBSD; }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; From 827479dc8057f60203a508e1c65649c7ae0a8eec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Jan 2012 16:29:57 +0000 Subject: [PATCH 04/11] htop: updated to version 1.0 svn path=/nixpkgs/trunk/; revision=31435 --- pkgs/os-specific/linux/htop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix index 923f2798145..fcec5d988fd 100644 --- a/pkgs/os-specific/linux/htop/default.nix +++ b/pkgs/os-specific/linux/htop/default.nix @@ -1,14 +1,14 @@ {fetchurl, stdenv, ncurses}: let - name = "htop-0.9"; + name = "htop-1.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/htop/${name}.tar.gz"; - sha256 = "4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd"; + sha256 = "242879b86db4b97e1090e7cd391247268ccbe90834ff34b6e8242926c9664852"; }; buildInputs = [ncurses]; From 7e66541ce8a469bb5236ab975651a51b002698dd Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 8 Jan 2012 19:29:07 +0000 Subject: [PATCH 05/11] Add bunch of kmymoney-4.6.1 dependencies svn path=/nixpkgs/trunk/; revision=31436 --- .../libraries/aqbanking/default.nix | 23 +++++++++++++++++++ .../libraries/gwenhywfar/default.nix | 19 +++++++++++++++ .../libraries/libalkimia/default.nix | 18 +++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 4 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/aqbanking/default.nix create mode 100644 pkgs/development/libraries/gwenhywfar/default.nix create mode 100644 pkgs/development/libraries/libalkimia/default.nix diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix new file mode 100644 index 00000000000..6c6e3013717 --- /dev/null +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gwenhywfar, pkgconfig, gmp, zlib }: + +stdenv.mkDerivation rec { + name = "aqbanking-5.0.21"; + + src = fetchurl { + url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-5.0.21.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "1xvzg640fswkrjrkrqzj0j9lnij7kcpnyvzd7nsg1by40wxwgp52"; + }; + + buildInputs = [ gwenhywfar gmp zlib ]; + + buildNativeInputs = [ pkgconfig ]; + + configureFlags = "--with-gwen-dir=${gwenhywfar}"; + + meta = { + maintainers = [ stdenv.lib.maintainers.urkud ]; + # Tries to install gwenhywfar plugin, thus `make install` fails + platforms = []; + }; +} diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix new file mode 100644 index 00000000000..207b81997af --- /dev/null +++ b/pkgs/development/libraries/gwenhywfar/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, qt4, gtk, pkgconfig, gnutls, libgcrypt }: + +stdenv.mkDerivation rec { + name = "gwenhywfar-4.3.1"; + + src = fetchurl { + url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-4.3.1.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "1r8ayi1nwcdcs4mncd7zigl8pk707j7whb85klsyir4nif52fxrs"; + }; + + propagatedBuildInputs = [ gnutls libgcrypt ]; + + buildInputs = [ qt4 gtk ]; + + buildNativeInputs = [ pkgconfig ]; + + QTDIR = qt4; +} diff --git a/pkgs/development/libraries/libalkimia/default.nix b/pkgs/development/libraries/libalkimia/default.nix new file mode 100644 index 00000000000..61c40599869 --- /dev/null +++ b/pkgs/development/libraries/libalkimia/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, kdelibs, gmpxx }: + +stdenv.mkDerivation rec { + name = "libalkimia-4.3.1"; + + src = fetchurl { + url = "http://kde-apps.org/CONTENT/content-files/137323-${name}.tar.bz2"; + sha256 = "1l5jgf0wc4s1sk4q5g2v78r9s7dg9k5ikm3pip6cbhjhfc0nv939"; + }; + + patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt"; + buildInputs = [ kdelibs gmpxx ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (kdelibs.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe3f8e57669..46adf6e2d30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3150,6 +3150,8 @@ let attr = callPackage ../development/libraries/attr { }; + aqbanking = callPackage ../development/libraries/aqbanking { }; + aubio = callPackage ../development/libraries/aubio { }; axis = callPackage ../development/libraries/axis { }; @@ -3698,6 +3700,8 @@ let gts = callPackage ../development/libraries/gts { }; + gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; + # TODO : Add MIT Kerberos and let admin choose. kerberos = heimdal; @@ -8101,6 +8105,8 @@ let kuickshow = callPackage ../applications/graphics/kuickshow { }; + libalkimia = callPackage ../development/libraries/libalkimia { }; + libktorrent = callPackage ../development/libraries/libktorrent { }; libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; From 532930a55f722e457748cc7d57a4931805d3a5f6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 8 Jan 2012 19:29:17 +0000 Subject: [PATCH 06/11] kmymoney-4.6.1 No aqbanking nor gwenhywfar since aqbanking FTBFS svn path=/nixpkgs/trunk/; revision=31437 --- pkgs/applications/office/kmymoney/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 8665b873150..8d1b5afe4d0 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, - shared_mime_info, perl, boost, gpgme }: + shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: stdenv.mkDerivation rec { - name = "kmymoney-4.5.3"; + name = "kmymoney-4.6.1"; src = fetchurl { url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2"; - sha256 = "1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9"; + sha256 = "0ympq70z0a9zrs623jznj6hnjph2rdhpra0np2mqm1mmy72bkjjz"; }; - buildInputs = [ kdelibs kdepimlibs perl boost gpgme ]; + buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ]; buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ]; + KDEDIRS = libalkimia; + patches = [ ./qgpgme.patch ]; meta = { From a398e2a40175dbd41ba13114503442fcce3731ca Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 8 Jan 2012 19:29:28 +0000 Subject: [PATCH 07/11] Add skrooge svn path=/nixpkgs/trunk/; revision=31438 --- pkgs/applications/office/skrooge/default.nix | 20 ++++++++++++++++++++ pkgs/applications/office/zanshin/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/applications/office/skrooge/default.nix create mode 100644 pkgs/applications/office/zanshin/default.nix diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix new file mode 100644 index 00000000000..b83f79f46e4 --- /dev/null +++ b/pkgs/applications/office/skrooge/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, kdelibs, grantlee, qca2, libofx, gettext }: + +stdenv.mkDerivation rec { + name = "skrooge-1.1.1"; + + src = fetchurl { + url = "http://skrooge.org/files/${name}.tar.bz2"; + sha256 = "0qkd1hay7lglb0b4iw3arlwgm0yr8x789x7zf815skxvfhdaclv5"; + }; + + buildInputs = [ kdelibs grantlee qca2 libofx ]; + + buildNativeInputs = [ gettext ]; + + meta = { + inherit (kdelibs.meta) platforms; + description = "A personal finance manager for KDE"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix new file mode 100644 index 00000000000..5cfe2d01f58 --- /dev/null +++ b/pkgs/applications/office/zanshin/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, kdelibs, kdepimlibs, boost }: + +stdenv.mkDerivation rec { + name = "zanshin-0.2.2"; + + src = fetchurl { + url = "http://files.kde.org/zanshin/zanshin-0.2.0.tar.bz2"; + sha256 = "0kskk8rj4bwx5zywxw0h2lgl7byw9dxzdcafb6xp5cvdkjkg9j87"; + }; + + buildInputs = [ kdelibs kdepimlibs boost ]; + + meta = { + description = "GTD for KDE"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (kdelibs.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46adf6e2d30..c398e982c27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8139,7 +8139,11 @@ let semnotes = callPackage ../applications/misc/semnotes { }; + skrooge = callPackage ../applications/office/skrooge { }; + yakuake = callPackage ../applications/misc/yakuake { }; + + zanshin = callPackage ../applications/office/zanshin { }; }; redshift = callPackage ../applications/misc/redshift { From de82ba69f821c311a175f7e8c0005f4eab31af67 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 8 Jan 2012 20:57:55 +0000 Subject: [PATCH 08/11] kde4.basket works. Remove kde3.kbasket svn path=/nixpkgs/trunk/; revision=31442 --- pkgs/applications/misc/kbasket/default.nix | 23 ---------------------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/applications/misc/kbasket/default.nix diff --git a/pkgs/applications/misc/kbasket/default.nix b/pkgs/applications/misc/kbasket/default.nix deleted file mode 100644 index 2cc51629e04..00000000000 --- a/pkgs/applications/misc/kbasket/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3, gpgme, -libgpgerror}: - -stdenv.mkDerivation { - name = "kbasket-1.0.3.1"; - - src = fetchurl { - url = http://basket.kde.org/downloads/basket-1.0.3.1.tar.gz; - sha256 = "1dgghxmabc3bz1644p6dfnjdjbm80jj6fh343r22nkp703q6fqbk"; - }; - - buildInputs = [kdelibs x11 zlib libjpeg libpng perl qt3 gpgme libgpgerror]; - - configureFlags = [ "--without-arts" "--with-extra-includes=${libjpeg}/include" "--x-libraries=${x11}/lib" ]; - - meta = { - description = "Multi-purpose note-taking application"; - homepage = http://kbasket.kde.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - license = "GPLv2+"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c398e982c27..af885d32b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8016,11 +8016,6 @@ let inherit (kde3) kdelibs; }; - kbasket = callPackage ../applications/misc/kbasket { - stdenv = overrideGCC stdenv gcc43; - inherit (kde3) kdelibs; - }; - kphone = callPackage ../applications/networking/kphone { stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files }; From 786a5c083f9186ded2bb599d1e12b3a487efdcd4 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 8 Jan 2012 20:58:04 +0000 Subject: [PATCH 09/11] games/six: add meta.platforms to see if it compiles svn path=/nixpkgs/trunk/; revision=31443 --- pkgs/games/six/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix index 2f11eab3cea..a95ed6c50c6 100644 --- a/pkgs/games/six/default.nix +++ b/pkgs/games/six/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { description = "Six - A Hex playing program for KDE"; homepage = http://six.retes.hu/; license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; }; buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ]; From d9d74208b59f5935e5241c8ed1ddf7e7a666ed98 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sun, 8 Jan 2012 23:27:45 +0000 Subject: [PATCH 10/11] Adding dvswitch: a digital video mixer intended for interactive live mixing of several incoming DV video streams, typically used for recording conferences svn path=/nixpkgs/trunk/; revision=31446 --- pkgs/applications/video/dvswitch/default.nix | 29 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/video/dvswitch/default.nix diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix new file mode 100644 index 00000000000..9ef9b678560 --- /dev/null +++ b/pkgs/applications/video/dvswitch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp, + libXv, libav, pixman, libpthreadstubs, pkgconfig }: + +stdenv.mkDerivation rec { + name = "dvswitch-${version}"; + version = "0.8.3.6"; + + src = fetchurl { + url = "https://alioth.debian.org/frs/download.php/3615/${name}.tar.gz"; + sha256 = "7bd196389f9913ae08e12a29e168d79324c508bb545eab114df77b0375cd87f0"; + }; + + buildInputs = [ + alsaLib boost cmake gtkmm libXau libXdmcp libXv libav + libpthreadstubs pixman pkgconfig + ]; + + installPhase = " + ensureDir $out + cp src/dv* $out/ + "; + + meta = with stdenv.lib; { + description = "digital video mixer intended for interactive live mixing of several incoming DV video streams"; + homepage = "http://dvswitch.alioth.debian.org"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af885d32b1f..263885fccdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6525,6 +6525,11 @@ let dvdauthor = callPackage ../applications/video/dvdauthor { }; + dvswitch = callPackage ../applications/video/dvswitch { + inherit (gtkLibs) gtkmm; + inherit (xlibs) libXau libXdmcp libXv libpthreadstubs pixman; + }; + dwm = callPackage ../applications/window-managers/dwm { patches = getConfig [ "dwm" "patches" ] []; }; From c403364c0607d61f15159b50a5de6e4348473676 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 8 Jan 2012 23:31:31 +0000 Subject: [PATCH 11/11] xmoto-0.5.9+libpng-1.5 patch svn path=/nixpkgs/trunk/; revision=31447 --- pkgs/games/xmoto/default.nix | 4 +++- pkgs/games/xmoto/r3402.patch | 26 ++++++++++++++++++++++++++ pkgs/games/xmoto/src-for-default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 pkgs/games/xmoto/r3402.patch diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 7ddbcc7de0f..af2e1e94bdc 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -4,7 +4,7 @@ let buildInputs = with a; [ chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode libxdg_basedir + lua5 ode libxdg_basedir libxml2 ]; in rec { @@ -17,6 +17,8 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"]; + patches = [ ./r3402.patch ]; + meta = { description = "X-Moto - obstacled race game"; maintainers = [ diff --git a/pkgs/games/xmoto/r3402.patch b/pkgs/games/xmoto/r3402.patch new file mode 100644 index 00000000000..787e5625b5f --- /dev/null +++ b/pkgs/games/xmoto/r3402.patch @@ -0,0 +1,26 @@ +Index: a/src/image/tim_png.cpp +=================================================================== +--- a/src/image/tim_png.cpp (revision 3401) ++++ b/src/image/tim_png.cpp (revision 3402) +@@ -25,7 +25,8 @@ + #include + #include + #include "tim.h" +-#include "png.h" ++#include ++#include + + /*============================================================================== + Types +Index: ChangeLog +=================================================================== +--- a/ChangeLog (revision 3401) ++++ b/ChangeLog (revision 3402) +@@ -1,3 +1,7 @@ ++X-Moto 0.5.10 2012- ++-------------------------------- ++ * libpng patch by Kelly Anderson ++ + X-Moto 0.5.9 2011-11-13 + -------------------------------- + * fix a compilation error with libxml diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix index d879f486d03..7d85cdbe528 100644 --- a/pkgs/games/xmoto/src-for-default.nix +++ b/pkgs/games/xmoto/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.5.7"; - name="xmoto-0.5.7"; - hash="19pwxjgvajv2img3sz8rd0c37d1gsidscwwjbm4jyxhahgg33mks"; + version="0.5.9"; + name="xmoto-0.5.9"; + hash="1r1kl3w2scncw754lgsfa7i6hh4mg39zc3bcvd1iqcmdfr25gmvl"; url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.7/xmoto-0.5.7-src.tar.gz"; + advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.9/xmoto-0.5.9-src.tar.gz"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 263885fccdd..743d6b80736 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6186,7 +6186,7 @@ let xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode libxdg_basedir; + lua5 ode libxdg_basedir libxml2; }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };