diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-12 00:15:05 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-12 00:15:05 +0000 |
| commit | 1dedc5ef8782842f744c36a434cc7b78edca7391 (patch) | |
| tree | 05b99b35354b259c6af791df747c91e62c7903f3 | |
| parent | 083699314db9bb8ba57a87bf53233dfa15b35bff (diff) | |
| download | nixlib-1dedc5ef8782842f744c36a434cc7b78edca7391.tar nixlib-1dedc5ef8782842f744c36a434cc7b78edca7391.tar.gz nixlib-1dedc5ef8782842f744c36a434cc7b78edca7391.tar.bz2 nixlib-1dedc5ef8782842f744c36a434cc7b78edca7391.tar.lz nixlib-1dedc5ef8782842f744c36a434cc7b78edca7391.tar.xz nixlib-1dedc5ef8782842f744c36a434cc7b78edca7391.tar.zst nixlib-1dedc5ef8782842f744c36a434cc7b78edca7391.zip | |
* Added Exult.
svn path=/nixpkgs/trunk/; revision=6501
| -rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL_mixer/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/games/exult/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
4 files changed, 33 insertions, 5 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3a1554e59e6a..a74a1590113c 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -11,12 +11,13 @@ stdenv.mkDerivation { url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz; md5 = "418b42956b7cd103bfab1b9077ccc149"; }; - buildInputs = [x11 libXrandr] - ++ (if openglSupport then [mesa] else []) - ++ (if alsaSupport then [alsaLib] else []); + propagatedBuildInputs = [x11 libXrandr]; + buildInputs = + (if openglSupport then [mesa] else []) ++ + (if alsaSupport then [alsaLib] else []); configureFlags = " --disable-x11-shared --disable-alsa-shared --enable-rpath - ${if alsaSupport then "--with-alsa-prefix=${alsaLib}" else ""} + ${if alsaSupport then "--with-alsa-prefix=${alsaLib}/lib" else ""} "; # patches = [./no-cxx.patch]; # NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */ diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix new file mode 100644 index 000000000000..33f157dbad87 --- /dev/null +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, SDL}: + +stdenv.mkDerivation { + name = "SDL_mixer-1.2.7"; + src = fetchurl { + url = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.7.tar.gz; + md5 = "7959b89c8f8f1564ca90968f6c88fa1e"; + }; + buildInputs = [SDL]; +} diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix new file mode 100644 index 000000000000..5a5d5c33e5e3 --- /dev/null +++ b/pkgs/games/exult/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng}: + +stdenv.mkDerivation { + name = "exult-1.2"; + src = fetchurl { + url = http://surfnet.dl.sourceforge.net/sourceforge/exult/exult-1.2.tar.gz; + md5 = "0fc88dee74a91724d25373ba0a8670ba"; + }; + buildInputs = [SDL SDL_mixer zlib libpng]; +# patches = [./gcc4.patch]; + NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e78a6234d4fe..8c87b83e84bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1824,6 +1824,10 @@ rec { alsaSupport = true; }; + SDL_mixer = (import ../development/libraries/SDL_mixer) { + inherit fetchurl stdenv SDL; + }; + boehmgc = (import ../development/libraries/boehm-gc) { inherit fetchurl stdenv; }; @@ -2629,7 +2633,8 @@ rec { }; exult = import ../games/exult { - inherit fetchurl stdenv SDL; + inherit fetchurl SDL SDL_mixer zlib libpng; + stdenv = overrideGCC stdenv gcc34; }; |