diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-28 20:50:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-28 20:50:12 +0000 |
| commit | c259379dc99dbe5add6baa5dd1b9e73112003c30 (patch) | |
| tree | 2174ac0542de9b96818439413a4a63f7b22d9063 /pkgs | |
| parent | 300456b2c83252f90e5820b37ed07e429fd8e554 (diff) | |
Getting mars to build. Somehow the fetchsvn in sfml_svn did not work anymore.
svn path=/nixpkgs/trunk/; revision=27037
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/sfml/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/games/mars/default.nix | 4 | ||||
| -rw-r--r-- | 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 a04f5caabe278..99b0f2e725cd1 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 46fc95f6b91f7..88342fd3948b6 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 f45f06aacc02a..6b35c1f5695e0 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 { }; |