diff options
author | Linus Heckemann <git@sphalerite.org> | 2024-05-14 21:13:31 +0200 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2024-05-14 22:08:13 +0200 |
commit | f62367776ff350ac2429abe2252e48376b89c37f (patch) | |
tree | 602516096dffba1a7c7b9d2d4cf7ad10ad08998a | |
parent | 2b6ad513c196adc8d7ed353f0c38430ad1cc88b1 (diff) |
openclonk: 8.1 -> unstable-2023-10-30
-rw-r--r-- | pkgs/games/openclonk/default.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 2249ab213a220..5dd8d8252d018 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, fetchDebianPatch, fetchpatch, cmake, pkg-config -, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchDebianPatch, fetchpatch, cmake, pkg-config +, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal, libepoxy +, curl , freealut, readline, libb2, gcc-unwrapped , enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: @@ -10,12 +11,14 @@ let sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; }; in stdenv.mkDerivation rec { - version = "8.1"; + version = "unstable-2023-10-30"; pname = "openclonk"; - src = fetchurl { - url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; - sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; + src = fetchFromGitHub { + owner = "openclonk"; + repo = "openclonk"; + rev = "5275334a11ef7c23ce809f35d6b443abd91b415f"; + sha256 = "14x5b2rh739156l4072rbsnv9n862jz1zafi6ng158ja5fwl16l2"; }; patches = [ @@ -26,15 +29,11 @@ in stdenv.mkDerivation rec { 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="; - }) ]; + enableParallelInstalling = false; + postInstall = '' - mv -v $out/games/openclonk $out/bin/ '' + lib.optionalString enableSoundtrack '' ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; @@ -43,6 +42,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut + libepoxy curl readline libb2 ]; |