nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

dfhack: move env variables into env for structuredAttrs

Browse Source 
(cherry picked from commit b58a49e4e4)
This commit is contained in:
Stefan Frijters
2026-05-25 14:51:39 +02:00
committed by github-actions[bot]
parent 636542dce1
commit 55f0fdf30b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/games/dwarf-fortress/dfhack/default.nix
View File

@@ -145,8 +145,19 @@ stdenv.mkDerivation {
# Use SDL_GetPrefPath since this takes XDG_DATA_HOME into account (which is correct).
++ optional (versionAtLeast version "52.02-r2") ./use-df-linux-dir.patch;
# gcc 11 fix
CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive";
env = {
# gcc 11 fix
CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive";
NIX_CFLAGS_COMPILE = toString (
[
"-Wno-error=deprecated-enum-enum-conversion"
]
++ optionals (versionOlder version "0.47") [
"-fpermissive"
]
);
};
nativeBuildInputs = [
cmake
@@ -200,11 +211,6 @@ stdenv.mkDerivation {
"-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=${fetchOverrides}"
];
NIX_CFLAGS_COMPILE = [
"-Wno-error=deprecated-enum-enum-conversion"
]
++ optionals (versionOlder version "0.47") [ "-fpermissive" ];
preFixup = ''
# Wrap dfhack scripts.
if [ -f $out/dfhack ]; then