diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-10-30 19:56:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-30 19:56:25 +0100 |
commit | 41a569d1980314c90431f1fe0a19639aa1b15309 (patch) | |
tree | 7626f75d012fa4b3995e0029a888da135f733c34 /pkgs/games | |
parent | 3594892234485d220822db60fd6c91271b4ec480 (diff) | |
parent | bacd02c315af77656c759b549854d5beed305b28 (diff) |
Merge pull request #198083 from SuperSandro2000/dwarf-fortress
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 11 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/game.nix | 6 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/wrapper/default.nix | 2 |
3 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 4f9688c844ff4..382537282748f 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -63,10 +63,7 @@ let inherit dwarf-fortress-unfuck; }; - # unfuck is linux-only right now, we will only use it there. - dwarf-fortress-unfuck = - if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; } - else null; + dwarf-fortress-unfuck = callPackage ./unfuck.nix { inherit dfVersion; }; twbt = callPackage ./twbt { inherit dfVersion; }; @@ -83,11 +80,7 @@ let in callPackage ./wrapper { inherit (self) themes; - - dwarf-fortress = dwarf-fortress; - twbt = twbt; - dfhack = dfhack; - dwarf-therapist = dwarf-therapist; + inherit dwarf-fortress twbt dfhack dwarf-therapist; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index e4b7349a69025..42f2c6ed127bd 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -18,8 +18,6 @@ with lib; let 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. # Other srcs are avilable like 32-bit mac & win, but I have only # included the ones most likely to be needed by Nixpkgs users. @@ -56,7 +54,7 @@ stdenv.mkDerivation { version = dfVersion; src = fetchurl { - url = "${homepage}df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2"; + url = "https://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2"; inherit sha256; }; @@ -103,7 +101,7 @@ stdenv.mkDerivation { meta = { description = "A single-player fantasy game with a randomly generated adventure world"; - inherit homepage; + homepage = "https://www.bay12games.com/dwarves/"; license = licenses.unfreeRedistributable; platforms = attrNames platforms; maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ]; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 3d1c3ead06042..0c1fbc6ca4de2 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -137,4 +137,6 @@ stdenv.mkDerivation { ''; preferLocalBuild = true; + + inherit (dwarf-fortress) meta; } |