colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openjk: unstable-2022-01-30 -> 0-unstable-2024-02-20

Browse Source 
Without the change the build fails against `gcc-13` on `master` as
https://hydra.nixos.org/build/249001657:

    In file included from /build/source/shared/qcommon/safe/gsl.h:4,
                     from /build/source/shared/qcommon/safe/sscanf.h:12,
                     from /build/source/shared/qcommon/safe/string.h:3,
                     from /build/source/shared/qcommon/safe/string.cpp:1:
    /build/source/lib/gsl-lite/include/gsl/gsl-lite.h:479:18: error: 'reverse_iterator' in namespace 'gsl::std' does not name a template type
      479 |     typedef std::reverse_iterator< iterator >                reverse_iterator;
          |                  ^~~~~~~~~~~~~~~~
This commit is contained in:
Sergei Trofimovich 2024-02-20 20:06:38 +00:00
parent e4af98e127
commit 0597bbf7d7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/games/openjk/default.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 }:
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2
, unstableGitUpdater
}:
let
jamp = makeDesktopItem rec {
@ -30,13 +32,13 @@ let
};
in stdenv.mkDerivation {
pname = "OpenJK";
version = "unstable-2022-01-30";
version = "0-unstable-2024-02-20";
src = fetchFromGitHub {
owner = "JACoders";
repo = "OpenJK";
rev = "235fb9e1a9c4537a603b2e54e444327d20d198a3";
sha256 = "sha256-DqP6wnu5sE7lQJGEdsEPOc6FIaJjqxt5ANKZ5eiabC4=";
rev = "1e8a7998ca2fe434daebb41d586ac3cd5296433a";
sha256 = "sha256-TKJNaz+oWNYyReFZVefg1frPXyd3Yl96JDklp1qY1to=";
};
dontAddPrefix = true;
@ -79,6 +81,8 @@ in stdenv.mkDerivation {
rm -rf $out/opt
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "An open-source engine for Star Wars Jedi Academy game";
homepage = "https://github.com/JACoders/OpenJK";