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

Use pname instead of derviation comparision when filtering #36

Merged
merged 1 commit into from
May 20, 2024
Merged

Use pname instead of derviation comparision when filtering #36

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
6 changes: 4 additions & 2 deletions pkgs/xmake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
# SPDX-License-Identifier: MIT
{pkgs}:
pkgs.xmake.overrideAttrs (prev: {
# Remove the cjson lua package from the dependancies.
buildInputs = builtins.filter (input: !(builtins.elem input [pkgs.lua.pkgs.cjson pkgs.tbox])) prev.buildInputs;
# Reset the configure flags so they don't contain `external=y`.
# This will cause vendored packages to be used instead of external (Nix-built packages).
# We need this because lua-cjson is different from xmake's vendored cjson when it comes to hex literals.
configureFlags = [];
# Remove vendored packages from the dependencies.
buildInputs = builtins.filter (input: !(builtins.elem input.pname ["lua-cjson" "tbox" "xmake-core-sv"])) prev.buildInputs;
enableParallelBuilding = true;
})