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

Revert "Revert "Merge pull request #23602 from periklis/topic_qt57_darwin"" #23764

Merged
merged 1 commit into from Mar 12, 2017
Merged

Revert "Revert "Merge pull request #23602 from periklis/topic_qt57_darwin"" #23764

merged 1 commit into from Mar 12, 2017

Conversation

periklis
Copy link
Contributor

@periklis periklis commented Mar 11, 2017 •
edited by LnL7

Revert to get back the changeset and fix for buildInputs missing gtk3 and libinput.

This reverts commit a2eae3b.

Motivation for this change
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
    • Linux
  • 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.

@mention-bot
Copy link

@periklis, thanks for your PR! By analyzing the history of the files in this pull request, we identified @LnL7, @ttuegel and @dezgeg to be potential reviewers.

periklis referenced this pull request Mar 11, 2017
@LnL7
Revert "Merge pull request #23602 from periklis/topic_qt57_darwin"
a2eae3b 
This reverts commit 4c0737e, reversing
changes made to 943c4ed.
@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Mar 11, 2017
@LnL7
Copy link
Member

LnL7 commented Mar 11, 2017

Testing, it's looking good so far.

@periklis
Copy link
Contributor Author

@LnL7 Did the hydra build on linux work?

@LnL7
Copy link
Member

LnL7 commented Mar 12, 2017

All the linux builds are green, a few of the qt packages still fail on darwin but those are not new. It looks good to merge unless you also want to fix those.

  • qt75.qtdeclarative
  • qt75.qtscript
  • qt57.qttranslations
ln: failed to create symbolic link '/nix/store/8fyyk7l2c0cvdf3k7kiq25d2ncm65zvc-qtdeclarative-5.7.1/lib/QtConcurrent.framework': File exists
builder for ‘/nix/store/cwa4h2v3rffwkqixbbvfvz2xbqkzhhwj-qtdeclarative-5.7.1.drv’ failed with exit code 1

@periklis
Copy link
Contributor Author

Thx for the feedback. Let's merge the qtbase part for now. I am on the ln-failed bugs already due to qtcreator. For those i'll open another PR.

@LnL7
Copy link
Member

LnL7 commented Mar 12, 2017

Allright, can you add something like the original commit message as the first line of the commit message.

@periklis
Copy link
Contributor Author

Sure i'll amend the commit message in a sec.

@LnL7 LnL7 merged commit 90be8a7 into NixOS:master Mar 12, 2017
@periklis periklis mentioned this pull request Mar 21, 2017
Merged
7 tasks
@periklis periklis deleted the topic_qt57_darwin branch July 25, 2018 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@periklis @mention-bot @LnL7