Qt 5: Fix debug flags #34047
Merged
Qt 5: Fix debug flags #34047
+11
−10
Conversation
This file contains 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
orivej
reviewed
Jan 19, 2018
| NIX_CFLAGS_COMPILE = | ||
| let arg = args.NIX_CFLAGS_COMPILE or []; in | ||
| optional (debug == true) "-DQT_NO_DEBUG" | ||
| ++ (if builtins.isList arg then arg else [arg]); |
There was a problem hiding this comment.
Note that there is lib.toList for this purpose.
|
Do we want to reset the commits that we have created to circumvent the bug? |
jtojnar
reviewed
Jan 19, 2018
| else "-DCMAKE_BUILD_TYPE=Release"); | ||
| ++ [ | ||
| "-DBUILD_TESTING=OFF" | ||
| ''-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}'' |
There was a problem hiding this comment.
Why use apostrophes instead of double quotes?
I don't think that's necessary. The only practical difference between |
If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags along with the common flags. See also: NixOS#34039 NixOS#34038 NixOS#33935 NixOS#33933 NixOS#33930 NixOS#33927
ttuegel
force-pushed
the
bugfix/qt-5/NIX_CFLAGS_COMPILE
branch
from
9a0e724 to
4a39533
Compare
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.
Motivation
Setting debug flags for Qt 5-based builds incorrectly overrides
NIX_CFLAGS_COMPILE.Incidentally I decided that
debugshould betrueorfalse, but nevernull. (What would that even mean?)Testing
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)