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

ericw-tools: fix build with gcc 11+

Browse Source
This commit is contained in:
Weijia Wang 2023-12-11 01:38:07 +01:00
parent 64891e361b
commit f1f879734f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/ericw-tools/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, gtest, fmt
, cmake, ninja, installShellFiles
}:
@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
popd
'';
patches = [
(fetchpatch {
url = "https://github.com/ericwa/ericw-tools/commit/c9570260fa895dde5a21272d76f9a3b05d59efdd.patch";
hash = "sha256-dZr2LWuJBAIT//XHXYEz2vhaK2mxtxkSJ4IQla8OXKI=";
})
];
nativeBuildInputs = [ cmake ninja installShellFiles ];
outputs = [ "out" "doc" "man" ];
@ -44,5 +51,6 @@ stdenv.mkDerivation rec {
description = "Map compile tools for Quake and Hexen 2";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ astro ];
platforms = platforms.unix;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -8005,7 +8005,7 @@ with pkgs;
eris-go = callPackage ../servers/eris-go { };
ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; };
ericw-tools = callPackage ../applications/misc/ericw-tools { };
cryfs = callPackage ../tools/filesystems/cryfs { };