lol

Merge pull request #273450 from wegank/ericw-tools-gcc-13

ericw-tools: fix build with gcc 11+

authored by

Weijia Wang and committed by
GitHub
1177cdd3 76bc5288

+10 -2
+9 -1
pkgs/applications/misc/ericw-tools/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub 1 + { lib, stdenv, fetchFromGitHub, fetchpatch 2 2 , gtest, fmt 3 3 , cmake, ninja, installShellFiles 4 4 }: ··· 20 20 popd 21 21 ''; 22 22 23 + patches = [ 24 + (fetchpatch { 25 + url = "https://github.com/ericwa/ericw-tools/commit/c9570260fa895dde5a21272d76f9a3b05d59efdd.patch"; 26 + hash = "sha256-dZr2LWuJBAIT//XHXYEz2vhaK2mxtxkSJ4IQla8OXKI="; 27 + }) 28 + ]; 29 + 23 30 nativeBuildInputs = [ cmake ninja installShellFiles ]; 24 31 25 32 outputs = [ "out" "doc" "man" ]; ··· 44 51 description = "Map compile tools for Quake and Hexen 2"; 45 52 license = licenses.gpl3Plus; 46 53 maintainers = with maintainers; [ astro ]; 54 + platforms = platforms.unix; 47 55 }; 48 56 }
+1 -1
pkgs/top-level/all-packages.nix
··· 8004 8004 8005 8005 eris-go = callPackage ../servers/eris-go { }; 8006 8006 8007 - ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; 8007 + ericw-tools = callPackage ../applications/misc/ericw-tools { }; 8008 8008 8009 8009 cryfs = callPackage ../tools/filesystems/cryfs { }; 8010 8010