summary refs log tree commit diff
path: root/pkgs/games/dwarf-fortress
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/games/dwarf-fortress')
-rw-r--r--pkgs/games/dwarf-fortress/default.nix1
-rw-r--r--pkgs/games/dwarf-fortress/dfhack/default.nix3
-rw-r--r--pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix2
-rw-r--r--pkgs/games/dwarf-fortress/lazy-pack.nix2
-rw-r--r--pkgs/games/dwarf-fortress/twbt/default.nix4
-rw-r--r--pkgs/games/dwarf-fortress/wrapper/default.nix2
6 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 2580e870321..650d5da5331 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -83,7 +83,6 @@ let
         inherit (self) themes;
 
         dwarf-fortress = dwarf-fortress;
-        dwarf-fortress-unfuck = dwarf-fortress-unfuck;
         twbt = twbt;
         dfhack = dfhack;
         dwarf-therapist = dwarf-therapist;
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index d65bdab8491..a7725054310 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -54,9 +54,6 @@ let
 
   version = release.dfHackRelease;
 
-  warning = if release.prerelease then builtins.trace "[DFHack] Version ${version} is a prerelease. Careful!"
-                                  else null;
-
   # revision of library/xml submodule
   xmlRev = release.xmlRev;
 
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 071ab2af0c5..e3005373b95 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }:
+{ pkgs, stdenv, dwarf-therapist, dwarf-fortress, makeWrapper }:
 
 let
   platformSlug = if stdenv.targetPlatform.is32bit then
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index 828ff77dfad..5f0328cba02 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, buildEnv, callPackage
+{ stdenvNoCC, lib, buildEnv
 , df-games, themes, latestVersion, versionToName
 , dfVersion ? latestVersion
   # This package should, at any given time, provide an opinionated "optimal"
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index 7c80c101246..e1f8e8abab8 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -41,10 +41,6 @@ let
   release = if hasAttr dfVersion twbt-releases
             then getAttr dfVersion twbt-releases
             else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}";
-
-  warning = if release.prerelease then builtins.trace "[TWBT] Version ${version} is a prerelease. Careful!"
-                                  else null;
-
 in
 
 stdenvNoCC.mkDerivation rec {
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 713f38f8a61..06bc6ca1fe5 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildEnv, substituteAll, runCommand
-, dwarf-fortress, dwarf-fortress-unfuck
+, dwarf-fortress
 , dwarf-therapist
 , enableDFHack ? false, dfhack
 , enableSoundSense ? false, soundSense, jdk