diff options
author | Peter Simons <simons@cryp.to> | 2010-05-17 09:21:42 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2010-05-17 09:21:42 +0000 |
commit | 71f164ac1e5d4baa69fbd770da2e813e0f387ffb (patch) | |
tree | d2367254c8ffc3ba3ffaa5d704487b60f446f97f /pkgs/games/six | |
parent | 0dc24d9f049ad3baf652047c624acc7811308bf2 (diff) | |
download | nixlib-71f164ac1e5d4baa69fbd770da2e813e0f387ffb.tar nixlib-71f164ac1e5d4baa69fbd770da2e813e0f387ffb.tar.gz nixlib-71f164ac1e5d4baa69fbd770da2e813e0f387ffb.tar.bz2 nixlib-71f164ac1e5d4baa69fbd770da2e813e0f387ffb.tar.lz nixlib-71f164ac1e5d4baa69fbd770da2e813e0f387ffb.tar.xz nixlib-71f164ac1e5d4baa69fbd770da2e813e0f387ffb.tar.zst nixlib-71f164ac1e5d4baa69fbd770da2e813e0f387ffb.zip |
Three Games and Perl Support for Irssi
Here are four patches. Three of them add expressions for games. The fourth, irssi-perl.patch, adds perl as an input for irssi, so that one can run perl plugins in irssi. I didn't make the perl input optional, but maybe it should be to keep the irssi expression light. svn path=/nixpkgs/trunk/; revision=21813
Diffstat (limited to 'pkgs/games/six')
-rw-r--r-- | pkgs/games/six/default.nix | 34 | ||||
-rw-r--r-- | pkgs/games/six/gcc43-includes.patch | 38 |
2 files changed, 72 insertions, 0 deletions
diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix new file mode 100644 index 000000000000..2f11eab3ceaf --- /dev/null +++ b/pkgs/games/six/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }: + +let + + versionNumber = "0.5.3"; + +in + +stdenv.mkDerivation { + + name = "six-${versionNumber}"; + + src = fetchurl { + url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz"; + sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4"; + }; + + meta = { + description = "Six - A Hex playing program for KDE"; + homepage = http://six.retes.hu/; + license = "GPLv2"; + }; + + buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ]; + + # Supress some warnings which are less useful to us when making packages. + NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses"; + + # Without "--x-libraries=", we get the error + # "impure path `/usr/lib' used in link". + configureFlags = "--x-libraries="; + + patches = [ ./gcc43-includes.patch ]; +} diff --git a/pkgs/games/six/gcc43-includes.patch b/pkgs/games/six/gcc43-includes.patch new file mode 100644 index 000000000000..83096bb0da2b --- /dev/null +++ b/pkgs/games/six/gcc43-includes.patch @@ -0,0 +1,38 @@ +This patch makes six compile with gcc 4.3 by including more header files. It +is based on the advice at <http://gcc.gnu.org/gcc-4.3/porting_to.html>. + +--- a/six/carrier.h ++++ b/six/carrier.h +@@ -2,6 +2,7 @@ + #ifndef CARRIER_H + #define CARRIER_H + ++#include <cstring> + #include <iostream> + #include <vector> + +diff --git a/six/hexgame.cpp b/six/hexgame.cpp +index 720e977..5d0dafe 100644 +--- a/six/hexgame.cpp ++++ b/six/hexgame.cpp +@@ -3,6 +3,7 @@ + #include <cassert> + #include <cctype> + #include <cstdio> ++#include <cstdlib> + + #include <string> + +diff --git a/six/main.cpp b/six/main.cpp +index 7fb5c21..b925a0c 100644 +--- a/six/main.cpp ++++ b/six/main.cpp +@@ -4,6 +4,8 @@ + #include "carrier.h" + #include "misc.h" + ++#include <cstdlib> ++ + #include <kapp.h> + #include <dcopclient.h> + #include <kaboutdata.h> |