gtkd: clean-up and 3.10.0 -> 3.11.0, tilix: fix build#415071
Merged
GaetanLepage merged 5 commits intoNixOS:masterfrom Jun 29, 2025
Merged
gtkd: clean-up and 3.10.0 -> 3.11.0, tilix: fix build#415071GaetanLepage merged 5 commits intoNixOS:masterfrom
GaetanLepage merged 5 commits intoNixOS:masterfrom
Conversation
Prince213
added
8.has: package (update)
github-actions
bot
added
10.rebuild-darwin: 1-10
Member
|
Contributor
|
Contributor
|
This update seems to break |
Member
|
Yeah, the comments in https://aur.archlinux.org/packages/tilix could probably help: diff --git a/pkgs/by-name/ti/tilix/package.nix b/pkgs/by-name/ti/tilix/package.nix
index 4ede51c57fcd..07b256124392 100644
--- a/pkgs/by-name/ti/tilix/package.nix
+++ b/pkgs/by-name/ti/tilix/package.nix
@@ -57,10 +57,17 @@ stdenv.mkDerivation (finalAttrs: {
libunwind
];
- postPatch = ''
- chmod +x meson_post_install.py
- patchShebangs meson_post_install.py
- '';
+ postPatch =
+ ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ ''
+ # Patch Align to GtkAlign, due to conflicting symbols
+ # https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=tilix&id=220ebe293e5087d58a2fba5a34cafb4885c4ef58
+ + ''
+ substituteInPlace source/gx/tilix/{prefeditor/prefdialog.d,terminal/terminal.d} \
+ --replace-fail "(Align." "(GtkAlign."
+ '';
passthru.tests.test = nixosTests.terminal-emulators.tilix;
|
Member
Author
|
Maybe we need to update #414928 and this at the same time. |
Member
|
|
Member
Author
|
Yeah you are right I think it's newer ldc that breaks gtkd. |
13 tasks
Prince213
force-pushed
the
push-yzxtnsssoqys
branch
from
f1ca30c to
5ae0b5a
Compare
Prince213
changed the title
Contributor
|
If you want (not a blocker), you may also switch to the |
Prince213
force-pushed
the
push-yzxtnsssoqys
branch
from
5ae0b5a to
b480452
Compare
Contributor
|
Member
Author
|
Ah right, I used |
Prince213
force-pushed
the
push-yzxtnsssoqys
branch
from
b480452 to
626454e
Compare
Prince213
force-pushed
the
push-yzxtnsssoqys
branch
from
626454e to
53bc90c
Compare
GaetanLepage
approved these changes
Jun 29, 2025
nixpkgs-ci
bot
added
the
12.approvals: 1
Member
Author
|
Member
Author
|
Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-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.