diff options
| author | Balletie <skip_meesie@hotmail.com> | 2015-04-19 22:46:51 +0200 |
|---|---|---|
| committer | Balletie <skip_meesie@hotmail.com> | 2015-04-20 16:49:39 +0200 |
| commit | d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592 (patch) | |
| tree | 6a6c57924239f9da5d66fb1c42286063a754df3f /pkgs/games/mars/default.nix | |
| parent | 2b6d011bec52a38268410378c24b89aa5a024dbc (diff) | |
| download | nixpkgs-d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592.tar nixpkgs-d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592.tar.gz nixpkgs-d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592.tar.bz2 nixpkgs-d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592.tar.lz nixpkgs-d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592.tar.xz nixpkgs-d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592.tar.zst nixpkgs-d03e6162dc2de5f1a4a4fe8c3c1cd5d5c5477592.zip | |
Update SFML to version 2.2, remove sfml_git, and update MARS (depended on sfml_git)
Diffstat (limited to 'pkgs/games/mars/default.nix')
| -rw-r--r-- | pkgs/games/mars/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 34094b637fc..2048dffb54b 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }: +{ stdenv, fetchgit, cmake, mesa, sfml, fribidi, taglib }: stdenv.mkDerivation rec { - name = "mars-${version}"; - version = "0.7.2"; - src = fetchurl { - url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz"; - sha256 = "092y0y1dghkvs0syjg9cv8iq0w29hkin8bznqc8sqm21v0swk451"; + name = "mars-${version}-${rev}"; + version = "0.7.5"; + rev = "c855d04409"; + src = fetchgit { + url = "https://github.com/thelaui/M.A.R.S..git"; + inherit rev; + sha256 = "70fc4b5823f2efb03e0bcd3fe82dee88ee93ddfd81d53de0d7eb3fe02793d65e"; }; - buildInputs = [ cmake mesa sfml_git fribidi taglib ]; + buildInputs = [ cmake mesa sfml fribidi taglib ]; + patches = [ ./unbind_fix.patch ]; installPhase = '' cd .. find -name '*.svn' -exec rm -rf {} \; |