tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
dwarf-therapist: remove texlive build-input
Morgan Jones
2 years ago
bbc4836a
c2f77d2e
+3
-6
2 changed files
expand all
collapse all
unified
split
pkgs
games
dwarf-fortress
default.nix
dwarf-therapist
default.nix
+2
-4
pkgs/games/dwarf-fortress/default.nix
···
1
-
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }:
2
3
# To whomever it may concern:
4
#
···
79
80
dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix {
81
inherit dwarf-fortress;
82
-
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {
83
-
texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]);
84
-
}).override (optionalAttrs (!isAtLeast50) {
85
# 41.2.5 is the last version to support Dwarf Fortress 0.47.
86
version = "41.2.5";
87
hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs=";
···
1
+
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, perlPackages, jdk8, jre8 }:
2
3
# To whomever it may concern:
4
#
···
79
80
dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix {
81
inherit dwarf-fortress;
82
+
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {}).override (optionalAttrs (!isAtLeast50) {
0
0
83
# 41.2.5 is the last version to support Dwarf Fortress 0.47.
84
version = "41.2.5";
85
hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs=";
+1
-2
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
···
4
, qtbase
5
, qtdeclarative
6
, cmake
7
-
, texlive
8
, ninja
9
, version ? "42.1.6"
10
, hash ? "sha256-VjCXT4sl3HsFILrqTc3JJSeRedZaOXUbf4KvSzTo0uc="
···
22
inherit hash;
23
};
24
25
-
nativeBuildInputs = [ texlive cmake ninja ];
26
buildInputs = [ qtbase qtdeclarative ];
27
28
enableParallelBuilding = true;
···
4
, qtbase
5
, qtdeclarative
6
, cmake
0
7
, ninja
8
, version ? "42.1.6"
9
, hash ? "sha256-VjCXT4sl3HsFILrqTc3JJSeRedZaOXUbf4KvSzTo0uc="
···
21
inherit hash;
22
};
23
24
+
nativeBuildInputs = [ cmake ninja ];
25
buildInputs = [ qtbase qtdeclarative ];
26
27
enableParallelBuilding = true;