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.

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

akonadi: Fixes build #34038

Merged
merged 1 commit into from Jan 19, 2018
Merged

akonadi: Fixes build #34038

merged 1 commit into from Jan 19, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Jan 19, 2018

Motivation for this change

Fixes: #34032

@peterhoeg @adisbladis

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@peterhoeg
Copy link
Member

Why do you escape " (double quote) inside an '' (2 single quotes)?

@bkchr
Copy link
Contributor Author

bkchr commented Jan 19, 2018

Without I get the following error:

<command-line>:0:86: error: 'mysqld' was not declared in this scope
/tmp/nix-build-akonadi-17.12.1.drv-0/akonadi-17.12.1/src/server/storage/dbconfigmysql.cpp:104:33: note: in expansion of macro 'NIXPKGS_MYSQL_MYSQLD'
     mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);

@adisbladis adisbladis merged commit d92eb4c into NixOS:master Jan 19, 2018
@adisbladis
Copy link
Member

Builds fine! Thanks 👍

@orivej
Copy link
Contributor

orivej commented Jan 19, 2018

I know this is not the first change that replaces NIX_CFLAGS_COMPILE with CXXFLAGS, but I have not yet seen an explanation why this is the right change. Since when and why did NIX_CFLAGS_COMPILE stop working?

@bkchr
Copy link
Contributor Author

bkchr commented Jan 19, 2018

@orivej that is a good question! Maybe we should bissect to find the commit that caused the problem.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 19, 2018

I'm doing a git bisect now and hopefully that gives us an answer.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 19, 2018

Okay, finished. Git bisect says that the following commit is the first failing: 75d2a7d

After looking at the commit, I assume that the following line could be the problem?
75d2a7d#diff-e846a595b53da93fc388a23603f424d2R17

@adisbladis @ttuegel

@ttuegel
Copy link
Member

ttuegel commented Jan 19, 2018

sigh I fixed that, and then I rebased, and for some reason Git ate my corrections. This happens practically every time I try to rebase; I probably just don't grok Git. I will open a new PR with the correction.

ttuegel added a commit to ttuegel/nixpkgs that referenced this pull request Jan 20, 2018
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants