treewide: fix packages that use cmake strict deps when cmake strict deps works#324545
Merged
SomeoneSerge merged 30 commits intoNixOS:masterfrom Jul 27, 2024
paparodeo:treewide-strict-deps-fixes
Merged
treewide: fix packages that use cmake strict deps when cmake strict deps works#324545SomeoneSerge merged 30 commits intoNixOS:masterfrom paparodeo:treewide-strict-deps-fixes
SomeoneSerge merged 30 commits intoNixOS:masterfrom
paparodeo:treewide-strict-deps-fixes
Conversation
This was referenced Jul 24, 2024
dbus-test-runner is executed and thus required in nativeCheckInputs
move python3 from buildInputs to nativeBuildInputs
move python3 from buildInputs to nativeBuildInputs
move flex from buildInputs to nativeBuildInputs
move swig4 from buildInputs to nativeBuildInputs
requires wayland-scanner (wayland) in nativeBuildInputs
move python3 to nativeBuildInputs
add qtdeclarative to nativeBuildInputs
add lttng-ust to nativeBuildInputs
add qtdeclarative to nativeBuildInputs
add qtdeclarative to nativeBuildInputs
add qtdeclarative to natvieBuildInputs
add lttng-ust to nativeBuildInputs
build searches for executables in path to install in script. this doesn't work with strict deps
add qtdeclarative to nativeBuildInputs
add qtdeclarative to nativeBuildInputs
configure phase looks for executables to be used in the runtime which is not compatible with strictDeps.
move python3 from buildInputs to nativeBuildInputs
add python3 and protobuf to nativeBuildInputs
move perl to nativeBuildInputs
move python3 to nativeBuildInputs
add wxGTK32 to nativeBuildInputs
add python3Packages.numpy to nativeBuildInputs
add protobuf to nativeBuildInputs
add flex & bison to nativeBuildInputs
move swig to nativeBuildInputs
add python3 to nativeBuildInputs
add wxGTK32 to nativeBuildInputs
add wayland-scanner to nativeBuildInputs
add python3Packages.python to nativeBuildInputs
Comment on lines
+43
to
+46
| = [ cmake python3 ] | ||
| ++ (lib.optional enableGui wrapQtAppsHook); | ||
| buildInputs | ||
| = [ boostPython python3 eigen python3Packages.apycula ] | ||
| = [ boostPython eigen python3Packages.apycula ] |
Contributor
There was a problem hiding this comment.
Yea I think these should use python3Packages and python3Packages.python but I'll submit this separately
SomeoneSerge
approved these changes
Jul 27, 2024
13 tasks
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
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.
Description of changes
strict deps doesn't quite work for cmake as it (effectively) pulls in
buildInputsinto thePATH(precisely, it makesfind_programdiscover executables formbuildInputsviaCMAKE_PREFIX_PATH). this change uses a fix for cmake #318226 so this doesn't happen and then fixes the packages that set strict deps but broke with the fixed cmake.there were a couple of lomiri packages where i just disabled strict deps due to how cmake would package scripts, it seemed to want to locate them in the PATH and then package them. I could've just added them to nativeBuildInputs but i didn't -- there are only 2 packages and marked by
disable strict depsin the title.kdePackages.* are fixed by #329977
packages were found using:
cmake-strict-deps.nix
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.