openclonk: unbreak
This commit is contained in:
parent
64891e361b
commit
34cbd933a7
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl, cmake, pkg-config
|
{ lib, stdenv, fetchurl, fetchDebianPatch, fetchpatch, cmake, pkg-config
|
||||||
, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal
|
, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal
|
||||||
, freealut, readline, gcc-unwrapped
|
, freealut, readline, libb2, gcc-unwrapped
|
||||||
, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther
|
, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -18,6 +18,21 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik";
|
sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchDebianPatch {
|
||||||
|
pname = "openclonk";
|
||||||
|
version = "8.1";
|
||||||
|
debianRevision = "3";
|
||||||
|
patch = "system-libb2.patch";
|
||||||
|
hash = "sha256-zuH6zxSQXRhnt75092Xwb6XYv8UG391E5Arbnr7ApiI=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-gcc-11-build.patch";
|
||||||
|
url = "https://github.com/openclonk/openclonk/commit/e304efde2c8643bbc0fc1ad5e85024982744b233.patch";
|
||||||
|
hash = "sha256-jfVCgeZuYo4x53zhljKcnMDMIBECTRsUSxkl6JaL6HA=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mv -v $out/games/openclonk $out/bin/
|
mv -v $out/games/openclonk $out/bin/
|
||||||
'' + lib.optionalString enableSoundtrack ''
|
'' + lib.optionalString enableSoundtrack ''
|
||||||
|
@ -28,7 +43,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut
|
SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut
|
||||||
readline
|
readline libb2
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ];
|
cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ];
|
||||||
|
@ -39,8 +54,8 @@ in stdenv.mkDerivation rec {
|
||||||
description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings";
|
description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings";
|
||||||
homepage = "https://www.openclonk.org";
|
homepage = "https://www.openclonk.org";
|
||||||
license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc;
|
license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc;
|
||||||
|
mainProgram = "openclonk";
|
||||||
maintainers = with maintainers; [ lheckemann ];
|
maintainers = with maintainers; [ lheckemann ];
|
||||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||||
broken = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -38119,7 +38119,7 @@ with pkgs;
|
||||||
|
|
||||||
openlierox = callPackage ../games/openlierox { };
|
openlierox = callPackage ../games/openlierox { };
|
||||||
|
|
||||||
openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; };
|
openclonk = callPackage ../games/openclonk { };
|
||||||
|
|
||||||
openjk = callPackage ../games/openjk { };
|
openjk = callPackage ../games/openjk { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user