diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
| commit | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (patch) | |
| tree | 3abc8e1606a2c80b6f5d14fef175e50800202163 /nixpkgs/pkgs/games/dwarf-fortress | |
| parent | a2c1eff83c3118a9aee8076c7f84f58137416b6e (diff) | |
| parent | 9008bc4eb62c878d0812105ea1b34255d651df88 (diff) | |
| download | nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.gz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.bz2 nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.lz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.xz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.zst nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/games/dwarf-fortress')
| -rw-r--r-- | nixpkgs/pkgs/games/dwarf-fortress/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/games/dwarf-fortress/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/default.nix index dd8e6b5503da..55157950c4f2 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/default.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texlive, perlPackages, jdk8, jre8 }: +{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }: # To whomever it may concern: # @@ -46,9 +46,7 @@ let versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { - texlive = texlive.combine { - inherit (texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; - }; + texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); }; # A map of names to each Dwarf Fortress package we know about. |