From c259379dc99dbe5add6baa5dd1b9e73112003c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 28 Apr 2011 20:50:12 +0000
Subject: [PATCH] Getting mars to build. Somehow the fetchsvn in sfml_svn did
 not work anymore.

svn path=/nixpkgs/trunk/; revision=27037
---
 pkgs/development/libraries/sfml/default.nix | 12 ++++++------
 pkgs/games/mars/default.nix                 |  4 ++--
 pkgs/top-level/all-packages.nix             |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index a04f5caabe27..99b0f2e725cd 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -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
diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix
index 46fc95f6b91f..88342fd3948b 100644
--- a/pkgs/games/mars/default.nix
+++ b/pkgs/games/mars/default.nix
@@ -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 @@ stdenv.mkDerivation rec {
     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 {} \;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f45f06aacc02..6b35c1f5695e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4169,7 +4169,7 @@ let
 
   simgear = callPackage ../development/libraries/simgear {};
 
-  sfml_svn = callPackage ../development/libraries/sfml { };
+  sfml_git = callPackage ../development/libraries/sfml { };
 
   slang = callPackage ../development/libraries/slang { };