Merge pull request #203045 from thenonameguy/fix/asc

asc: 2.6.0.0 -> 2.6.3.0
This commit is contained in:
7c6f434c 2022-11-26 17:20:55 +00:00 committed by GitHub
commit 698540f73f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 16 deletions

View file

@ -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; {

View file

@ -33963,7 +33963,6 @@ with pkgs;
asc = callPackage ../games/asc {
lua = lua5_1;
libsigcxx = libsigcxx12;
physfs = physfs_2;
};