mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge pull request #209333 from mikroskeem/update-eduke32
eduke32: 20221026 -> 20221225
This commit is contained in:
commit
d1b1b0d1b0
@ -18,13 +18,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "eduke32";
|
||||
version = "20221026";
|
||||
rev = "10165";
|
||||
revExtra = "a9c797dcb";
|
||||
version = "20221225";
|
||||
rev = "10166";
|
||||
revExtra = "122aee012";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz";
|
||||
sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU=";
|
||||
sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -48,7 +48,12 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ]
|
||||
++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm;
|
||||
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
postPatch = ''
|
||||
substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \
|
||||
--replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \
|
||||
--replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
|
||||
--replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace source/build/src/glbuild.cpp \
|
||||
--replace libGLU.so ${libGLU}/lib/libGLU.so
|
||||
|
||||
@ -56,11 +61,6 @@ in stdenv.mkDerivation rec {
|
||||
substituteInPlace source/glad/src/$f \
|
||||
--replace libGL.so ${libGL}/lib/libGL.so
|
||||
done
|
||||
|
||||
substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \
|
||||
--replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \
|
||||
--replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
|
||||
--replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
|
Loading…
Reference in New Issue
Block a user