Author: viric
Date: Thu Apr 28 20:50:12 2011
New Revision: 27037
URL: https://svn.nixos.org/websvn/nix/?rev=27037&sc=1
Log:
Getting mars to build. Somehow the fetchsvn in sfml_svn did not work anymore.
Modified:
nixpkgs/trunk/pkgs/development/libraries/sfml/default.nix
nixpkgs/trunk/pkgs/games/mars/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/sfml/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/sfml/default.nix Thu Apr 28
16:04:07 2011 (r27036)
+++ nixpkgs/trunk/pkgs/development/libraries/sfml/default.nix Thu Apr 28
20:50:12 2011 (r27037)
@@ -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
}:
stdenv.mkDerivation rec {
- name = "sfml-svn-${version}";
- version = "1808";
- src = fetchsvn {
- url = "https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2";;
- rev = version;
+ name = "sfml-git-20110428";
+ src = fetchgit {
+ url = "http://github.com/LaurentGomila/SFML.git";;
+ rev = "6eac4256f3be353f51ee";
+ sha256 =
"1b4f1901e0e482dbc0ad60e2821af766fb8ce093de51d678918ac2a0fb6e8587";
};
buildInputs = [ cmake mesa libX11 freetype libjpeg openal libsndfile glew
libXrandr libXrender
Modified: nixpkgs/trunk/pkgs/games/mars/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/mars/default.nix Thu Apr 28 16:04:07 2011
(r27036)
+++ nixpkgs/trunk/pkgs/games/mars/default.nix Thu Apr 28 20:50:12 2011
(r27037)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, mesa, sfml_svn, fribidi, taglib }:
+{ stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }:
stdenv.mkDerivation rec {
name = "mars-${version}";
version = "0.7.2";
@@ -6,7 +6,7 @@
url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz";
sha256 = "0k4bfa7zay4w07hr1n4fx47xh2zy1ch5l7byvyvql21g244pjv5y";
};
- buildInputs = [ cmake mesa sfml_svn fribidi taglib ];
+ buildInputs = [ cmake mesa sfml_git fribidi taglib ];
installPhase = ''
cd ..
find -name '*.svn' -exec rm -rf {} \;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 28 16:04:07
2011 (r27036)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 28 20:50:12
2011 (r27037)
@@ -4169,7 +4169,7 @@
simgear = callPackage ../development/libraries/simgear {};
- sfml_svn = callPackage ../development/libraries/sfml { };
+ sfml_git = callPackage ../development/libraries/sfml { };
slang = callPackage ../development/libraries/slang { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
