swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-19 20:09:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid top-level with ...; in pkgs/games/dwarf-fortress/default.nix

Browse source
This commit is contained in:
Philip Taron 2024-03-14 11:32:35 -07:00 committed by Valentin Gagarin
parent 81d3babe25
commit 8f49dedbcb
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/games/dwarf-fortress/default.nix
View file

@ -32,9 +32,16 @@
# changes on later launches, but consider extending the wrapper with your
# desired options instead.
with lib;
let
inherit (lib)
attrNames
getAttr
importJSON
listToAttrs
recurseIntoAttrs
replaceStrings
;
callPackage = newScope self;
# The latest Dwarf Fortress version. Maintainers: when a new version comes
@ -43,14 +50,14 @@ let
latestVersion = "0.47.05";
# Converts a version to a package name.
versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}";
dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist {
texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]);
};
# A map of names to each Dwarf Fortress package we know about.
df-games = lib.listToAttrs (map
df-games = listToAttrs (map
(dfVersion: {
name = versionToName dfVersion;
value =
@ -83,10 +90,10 @@ let
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
})
(lib.attrNames self.df-hashes));
(attrNames self.df-hashes));
self = rec {
df-hashes = lib.importJSON ./game.json;
df-hashes = importJSON ./game.json;
# Aliases for the latest Dwarf Fortress and the selected Therapist install
dwarf-fortress = getAttr (versionToName latestVersion) df-games;