-
-
Notifications
You must be signed in to change notification settings - Fork 15k
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.
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
tectonic: 0.15.0 -> 0.15.0-unstable-2025-02-21 #384610
Conversation
f677622
to
bb8a110
Compare
This fixes this build error: It builds now with this update, but the |
We probably only need to change the added P.S. for the Update: nope, upstream changed the cli such that our wrapper no longer works... Now that's tricky. Let me see what we can do... |
Clang works! See patch 2 below (patch 1 is the darwin cleanup which applies nonetheless): From d9731ee1ba8fe948a02862a88b4fdc58bf89e999 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 23 Feb 2025 23:32:34 +0200
Subject: [PATCH 1/2] tectonic: cleanup Darwin specific apple_sdk usage
---
.../by-name/te/tectonic-unwrapped/package.nix | 22 +++++--------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix
index e9b9dcb2c815..197568c236d5 100644
--- a/pkgs/by-name/te/tectonic-unwrapped/package.nix
+++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix
@@ -11,7 +11,6 @@
stdenv,
fetchFromGitHub,
rustPlatform,
- darwin,
fontconfig,
harfbuzzFull,
openssl,
@@ -56,21 +55,12 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "external-harfbuzz" ];
- buildInputs =
- [
- icu
- fontconfig
- harfbuzzFull
- openssl
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin (
- with darwin.apple_sdk.frameworks;
- [
- ApplicationServices
- Cocoa
- Foundation
- ]
- );
+ buildInputs = [
+ icu
+ fontconfig
+ harfbuzzFull
+ openssl
+ ];
postInstall =
''
From c606661d563a61d51fb875b99b250226ea0e6a5b Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Mon, 24 Feb 2025 15:37:48 +0800
Subject: [PATCH 2/2] tectonic, tectonic-unwrapped: fix linux build
---
pkgs/by-name/te/tectonic-unwrapped/package.nix | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix
index 197568c236d5..50d64c8416e1 100644
--- a/pkgs/by-name/te/tectonic-unwrapped/package.nix
+++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix
@@ -8,7 +8,7 @@
{
lib,
- stdenv,
+ clangStdenv,
fetchFromGitHub,
rustPlatform,
fontconfig,
@@ -19,7 +19,17 @@
fetchpatch2,
}:
-rustPlatform.buildRustPackage rec {
+let
+
+ buildRustPackage = rustPlatform.buildRustPackage.override {
+ # use clang to work around build failure with GCC 14
+ # see: https://github.com/tectonic-typesetting/tectonic/issues/1263
+ stdenv = clangStdenv;
+ };
+
+in
+
+buildRustPackage rec {
pname = "tectonic";
version = "0.15.0";
@@ -67,7 +77,7 @@ rustPlatform.buildRustPackage rec {
# Makes it possible to automatically use the V2 CLI API
ln -s $out/bin/tectonic $out/bin/nextonic
''
- + lib.optionalString stdenv.hostPlatform.isLinux ''
+ + lib.optionalString clangStdenv.hostPlatform.isLinux ''
substituteInPlace dist/appimage/tectonic.desktop \
--replace Exec=tectonic Exec=$out/bin/tectonic
install -D dist/appimage/tectonic.desktop -t $out/share/applications/
@doronbehar shall we roll with clang for now and worry about |
Yes I won't mind worry about the update later. I took a small glance at what needed for the next version regarding the bundle URL and it seemed it requires a non-trivial understand of how upstream manages the bundles, and I hope it'd be easier to figure it out once upstream will make a release and publish release notes. Could you please open a PR with the patches changes you pasted? It seems it'd be easier for you as you have those committed already :). |
No problem! Created: |
Description of changes
Things done
nix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.