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/applications/science/electronics/xyce/default.nix | |
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/applications/science/electronics/xyce/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/science/electronics/xyce/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix index aee1d25a04cc..663d6e025c5c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix @@ -16,7 +16,7 @@ , trilinos , withMPI ? false # for doc -, texlive +, texliveMedium , pandoc , enableDocs ? true # for tests @@ -81,16 +81,14 @@ stdenv.mkDerivation rec { gfortran libtool_2 ] ++ lib.optionals enableDocs [ - (texlive.combine { - inherit (texlive) - scheme-medium + (texliveMedium.withPackages (ps: with ps; [ koma-script optional framed enumitem multirow - preprint; - }) + preprint + ])) ]; buildInputs = [ |