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

tdesktop: 1.0.27 -> 1.1.7 #26690

Merged
merged 1 commit into from
Jun 25, 2017
Merged

tdesktop: 1.0.27 -> 1.1.7 #26690

merged 1 commit into from
Jun 25, 2017
+19 −7

Conversation

DIzFer
Copy link
Contributor

@DIzFer DIzFer commented Jun 18, 2017

Motivation for this change
Things done

Now using gcc6 as per official recommendation, and some pushd/popd magic to apply a patch that's not supposed to be applied from root. Do tell if there's a better way to do that.
Also, GYP_DEFINES didn't look like they were being used, since compilation was failing at some doUpdateCheck invocation (which is supposed to be disabled), so I copied the -Dbuild_defines=${GYP_DEFINES} line from Arch's PKGBUILD and is now working.

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

Sorry, something went wrong.

@mention-bot
Copy link

@DIzFer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar and @garbas to be potential reviewers.

@DIzFer DIzFer force-pushed the telegram-update branch from d525f02 to 6f0f8f8 Compare June 18, 2017 09:22
@pSub pSub added the 8.has: package (update) This PR updates a package to a newer version label Jun 18, 2017
@Mic92 Mic92 added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 18, 2017
@DIzFer DIzFer force-pushed the telegram-update branch from 48624db to 9cb7616 Compare June 19, 2017 14:15
@DIzFer
Copy link
Contributor Author

DIzFer commented Jun 20, 2017

I don't see any issue in the Travis log other than it being really long because of qt-5.8. Is there anything I can do about it?

tdesktop: 1.0.27 -> 1.1.7

Verified

This commit was signed with the committer’s verified signature. The key has expired.
Ma27 Maximilian Bosch
GPG key ID: 091DBF4D1FC46B8E
Expired
Verified
Learn about vigilant mode
aa2b643
@DIzFer DIzFer force-pushed the telegram-update branch from 9cb7616 to aa2b643 Compare June 22, 2017 07:21
@Mic92 Mic92 merged commit 46427b7 into NixOS:master Jun 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 8.has: package (update) This PR updates a package to a newer version
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@DIzFer @mention-bot @pSub @Mic92