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

Merge pull request #198083 from SuperSandro2000/dwarf-fortress

Browse Source
This commit is contained in:
Sandro 2022-10-30 19:56:25 +01:00 committed by GitHub
commit 41a569d198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/dwarf-fortress/default.nix
View File

@ -63,10 +63,7 @@ let
inherit dwarf-fortress-unfuck; inherit dwarf-fortress-unfuck;
}; };
# unfuck is linux-only right now, we will only use it there. dwarf-fortress-unfuck = callPackage ./unfuck.nix { inherit dfVersion; };
dwarf-fortress-unfuck =
if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; }
else null;
twbt = callPackage ./twbt { inherit dfVersion; }; twbt = callPackage ./twbt { inherit dfVersion; };
@ -83,11 +80,7 @@ let
in in
callPackage ./wrapper { callPackage ./wrapper {
inherit (self) themes; inherit (self) themes;
inherit dwarf-fortress twbt dfhack dwarf-therapist;
dwarf-fortress = dwarf-fortress;
twbt = twbt;
dfhack = dfhack;
dwarf-therapist = dwarf-therapist;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };

6
pkgs/games/dwarf-fortress/game.nix
View File

@ -18,8 +18,6 @@ with lib;
let let
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
homepage = "http://www.bay12games.com/dwarves/";
# Map Dwarf Fortress platform names to Nixpkgs platform names. # Map Dwarf Fortress platform names to Nixpkgs platform names.
# Other srcs are avilable like 32-bit mac & win, but I have only # Other srcs are avilable like 32-bit mac & win, but I have only
# included the ones most likely to be needed by Nixpkgs users. # included the ones most likely to be needed by Nixpkgs users.
@ -56,7 +54,7 @@ stdenv.mkDerivation {
version = dfVersion; version = dfVersion;
src = fetchurl { src = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2"; url = "https://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2";
inherit sha256; inherit sha256;
}; };
@ -103,7 +101,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "A single-player fantasy game with a randomly generated adventure world"; description = "A single-player fantasy game with a randomly generated adventure world";
inherit homepage; homepage = "https://www.bay12games.com/dwarves/";
license = licenses.unfreeRedistributable; license = licenses.unfreeRedistributable;
platforms = attrNames platforms; platforms = attrNames platforms;
maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ]; maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ];

2
pkgs/games/dwarf-fortress/wrapper/default.nix
View File

@ -137,4 +137,6 @@ stdenv.mkDerivation {
''; '';
preferLocalBuild = true; preferLocalBuild = true;
inherit (dwarf-fortress) meta;
} }