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

Jump to bottom

kimageformats: Fixes build #33927

Merged
merged 1 commit into from Jan 16, 2018
Merged

kimageformats: Fixes build #33927

merged 1 commit into from Jan 16, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Jan 16, 2018 •
edited

Motivation for this change

Was broken after recent changes.

@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.

@bkchr bkchr requested a review from ttuegel as a code owner January 16, 2018 08:53
@bkchr bkchr mentioned this pull request Jan 16, 2018
Merged
8 tasks
@Mic92 Mic92 merged commit 7465edc into NixOS:master Jan 16, 2018
ttuegel added a commit to ttuegel/nixpkgs that referenced this pull request Jan 20, 2018
@ttuegel
qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE
c1720b4 
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
Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bkchr @Mic92 @GrahamcOfBorg