diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/games/eduke32/default.nix | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/games/eduke32/default.nix')
-rw-r--r-- | nixpkgs/pkgs/games/eduke32/default.nix | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/games/eduke32/default.nix b/nixpkgs/pkgs/games/eduke32/default.nix index a25c6fa9050f..051e097eb3a3 100644 --- a/nixpkgs/pkgs/games/eduke32/default.nix +++ b/nixpkgs/pkgs/games/eduke32/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem -, alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL -, SDL2, SDL2_mixer -, AGL, Cocoa, GLUT, OpenGL +{ lib +, stdenv +, fetchurl +, makeWrapper +, pkg-config +, nasm +, makeDesktopItem +, alsa-lib +, flac +, gtk2 +, libvorbis +, libvpx +, libGLU +, libGL +, SDL2 +, SDL2_mixer +, AGL +, Cocoa +, GLUT +, OpenGL }: let @@ -18,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20221225"; - rev = "10166"; - revExtra = "122aee012"; + version = "20230926"; + rev = "10459"; + revExtra = "8feaf6c25"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q="; + hash = "sha256-GQOpDQm2FeaOMyYu9L5zhrM6XFvZAHMAwn1tSK7RCB8="; }; buildInputs = [ @@ -49,7 +65,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; postPatch = '' - substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + substituteInPlace source/imgui/src/imgui_impl_sdl2.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>' |