Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

texmacs: Use LLVM 17 on Darwin #373205

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

texmacs: Use LLVM 17 on Darwin #373205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions pkgs/applications/editors/texmacs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
lib,
stdenv,
llvmPackages_17,
callPackage,
fetchurl,
guile_1_8,
Expand Down Expand Up @@ -40,7 +41,7 @@ let
tex = texliveSmall;
};
in
stdenv.mkDerivation {
(if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv).mkDerivation {
inherit pname version;

src = fetchurl {
Expand All @@ -63,21 +64,17 @@ stdenv.mkDerivation {
cmake
];

buildInputs =
[
guile_1_8
qtbase
qtsvg
ghostscriptX
freetype
libjpeg
sqlite
git
python3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
qtmacextras
];
buildInputs = [
guile_1_8
qtbase
qtsvg
ghostscriptX
freetype
libjpeg
sqlite
git
python3
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ];

cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
(lib.cmakeFeature "TEXMACS_GUI" "Qt")
Expand Down