public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Getting mars to build. Somehow the fetchsvn in sfml_svn did not work anymore.

Browse Source 
svn path=/nixpkgs/trunk/; revision=27037
This commit is contained in:
Lluís Batlle i Rossell 2011-04-28 20:50:12 +00:00
parent 300456b2c8
commit c259379dc9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/sfml/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchsvn, cmake, mesa, libX11, freetype, libjpeg, openal, libsndfile { stdenv, fetchgit, cmake, mesa, libX11, freetype, libjpeg, openal, libsndfile
, glew, libXrandr, libXrender , glew, libXrandr, libXrender
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sfml-svn-${version}"; name = "sfml-git-20110428";
version = "1808"; src = fetchgit {
src = fetchsvn { url = "http://github.com/LaurentGomila/SFML.git";
url = "https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2"; rev = "6eac4256f3be353f51ee";
rev = version; sha256 = "1b4f1901e0e482dbc0ad60e2821af766fb8ce093de51d678918ac2a0fb6e8587";
}; };
buildInputs = [ cmake mesa libX11 freetype libjpeg openal libsndfile glew buildInputs = [ cmake mesa libX11 freetype libjpeg openal libsndfile glew
libXrandr libXrender libXrandr libXrender

4
pkgs/games/mars/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, mesa, sfml_svn, fribidi, taglib }: { stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mars-${version}"; name = "mars-${version}";
version = "0.7.2"; version = "0.7.2";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz"; url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz";
sha256 = "0k4bfa7zay4w07hr1n4fx47xh2zy1ch5l7byvyvql21g244pjv5y"; sha256 = "0k4bfa7zay4w07hr1n4fx47xh2zy1ch5l7byvyvql21g244pjv5y";
}; };
buildInputs = [ cmake mesa sfml_svn fribidi taglib ]; buildInputs = [ cmake mesa sfml_git fribidi taglib ];
installPhase = '' installPhase = ''
cd .. cd ..
find -name '*.svn' -exec rm -rf {} \; find -name '*.svn' -exec rm -rf {} \;

2
pkgs/top-level/all-packages.nix
View File

@ -4169,7 +4169,7 @@ let
simgear = callPackage ../development/libraries/simgear {}; simgear = callPackage ../development/libraries/simgear {};
sfml_svn = callPackage ../development/libraries/sfml { }; sfml_git = callPackage ../development/libraries/sfml { };
slang = callPackage ../development/libraries/slang { }; slang = callPackage ../development/libraries/slang { };