diff options
| author | Krisztian Szabo <krisztian@deep-impact.ch> | 2022-11-26 13:07:13 +0100 |
|---|---|---|
| committer | Krisztian Szabo <krisztian@deep-impact.ch> | 2022-11-26 13:09:32 +0100 |
| commit | a63ffb18cbea25f8dbe7d7f83600d293842d8176 (patch) | |
| tree | cceb1cfd8a4c261d458d353aed860d782b1fc4b0 /pkgs/games/asc | |
| parent | 81c0d0c5f4ebf361f46e6ce68379843820e432d4 (diff) | |
asc: 2.6.0.0 -> 2.6.3.0
- Fixes build
- Updated to new source repository which users newer libraries
Diffstat (limited to 'pkgs/games/asc')
| -rw-r--r-- | pkgs/games/asc/default.nix | 72 |
1 files changed, 57 insertions, 15 deletions
diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index f351040ff883..94a16f60140d 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -1,27 +1,69 @@ -{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs -, boost, expat, freetype, libjpeg, wxGTK32, lua, perl, pkg-config, zlib, zip, bzip2 -, libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: +{ fetchFromGitHub +, lib +, stdenv +, SDL +, SDL_image +, SDL_mixer +, SDL_sound +, libsigcxx +, physfs +, boost +, expat +, freetype +, libjpeg +, wxGTK32 +, lua +, perl +, pkg-config +, zlib +, zip +, bzip2 +, libpng +, libtiff +, fluidsynth +, libmikmod +, libvorbis +, flac +, libogg +}: stdenv.mkDerivation rec { pname = "asc"; - version = "2.6.0.0"; + version = "2.6.3.0"; - src = fetchurl { - url = "mirror://sourceforge/asc-hq/asc-${version}.tar.bz2"; - sha256 = "1fybasb6srqfg6pqbvh0s0vvzjq9r0n6aq0z44hs7n68kmaam775"; + src = fetchFromGitHub { + owner = "ValHaris"; + repo = "asc-hq"; + rev = "fa3bca082a5cea2b35812349f99b877f0113aef0"; + sha256 = "atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ="; }; - configureFlags = [ "--disable-paragui" "--disable-paraguitest" ]; - - NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems - hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ - SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat - freetype libjpeg wxGTK32 lua perl zlib zip bzip2 libpng - libtiff fluidsynth libmikmod flac libvorbis libogg + SDL + SDL_image + SDL_mixer + SDL_sound + physfs + boost + expat + freetype + libjpeg + wxGTK32 + lua + perl + zlib + zip + bzip2 + libpng + libtiff + fluidsynth + libmikmod + flac + libvorbis + libogg + libsigcxx ]; meta = with lib; { |