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

dwarf-therapist: remove texlive build-input

Browse Source
This commit is contained in:
Morgan Jones 2024-05-05 23:43:16 -07:00
parent c2f77d2e09
commit bbc4836a61
No known key found for this signature in database
GPG Key ID: 52BAC54ED447974E
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }:
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, perlPackages, jdk8, jre8 }:
# To whomever it may concern:
#
@ -79,9 +79,7 @@ let
dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix {
inherit dwarf-fortress;
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {
texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]);
}).override (optionalAttrs (!isAtLeast50) {
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {}).override (optionalAttrs (!isAtLeast50) {
# 41.2.5 is the last version to support Dwarf Fortress 0.47.
version = "41.2.5";
hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs=";

3
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View File

@ -4,7 +4,6 @@
, qtbase
, qtdeclarative
, cmake
, texlive
, ninja
, version ? "42.1.6"
, hash ? "sha256-VjCXT4sl3HsFILrqTc3JJSeRedZaOXUbf4KvSzTo0uc="
@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
inherit hash;
};
nativeBuildInputs = [ texlive cmake ninja ];
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ qtbase qtdeclarative ];
enableParallelBuilding = true;