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

discord: 0.0.12 -> 0.0.13 #105916

Merged
merged 1 commit into from Dec 5, 2020
Merged

discord: 0.0.12 -> 0.0.13 #105916

merged 1 commit into from Dec 5, 2020

Conversation

ldesgoui
Copy link
Contributor

@ldesgoui ldesgoui commented Dec 4, 2020 •
edited

Motivation for this change

Discord still prevents you from using outdated versions

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ldesgoui
Copy link
Contributor Author

ldesgoui commented Dec 4, 2020

We probably want backports for this, should I try my hand? 20.03 and 20.09?

Chiiruno
Chiiruno approved these changes Dec 4, 2020
View reviewed changes
Copy link
Contributor

@Chiiruno Chiiruno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, nixpkgs-review checks out.
LGTM.

@Chiiruno
Copy link
Contributor

Chiiruno commented Dec 4, 2020

cc @Mic92 for merge

@ldesgoui ldesgoui mentioned this pull request Dec 4, 2020
Merged
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Dec 4, 2020 •
edited

We probably want backports for this, should I try my hand? 20.03 and 20.09?

20.03 is EOL and does not receive any updates anymore.

@Xe
Copy link
Contributor

Xe commented Dec 4, 2020

Please add libdrm and mesa to the libPath or this will fail on launch.

@ldesgoui
Copy link
Contributor Author

ldesgoui commented Dec 4, 2020

Please add libdrm and mesa to the libPath or this will fail on launch.

It runs fine for me, what issue are you experiencing?

@Xe
Copy link
Contributor

Xe commented Dec 4, 2020 

/nix/store/i9v8ym6dkrv71a1zc0v629x9kbdyxg1s-discord-canary-0.0.116/bin/DiscordCanary: error while loading shared libraries: libgbm.so.1: cannot open shared object file: No such file or directory

@Chiiruno
Copy link
Contributor

Chiiruno commented Dec 4, 2020 via email

@ldesgoui
Copy link
Contributor Author

ldesgoui commented Dec 4, 2020 •
edited

That seems to be a canary issue, and not pursuant to this PR.

mesa and libdrm definitely become part of the discord closure in this PR so it kind of is

/nix/store/i9v8ym6dkrv71a1zc0v629x9kbdyxg1s-discord-canary-0.0.116/bin/DiscordCanary: error while loading shared libraries: libgbm.so.1: cannot open shared object file: No such file or directory

Thanks, I'm really not sure why that would be the case, autoPatchelfHook properly picks up both mesa and libdrm and adds it to the RPATH of opt/Discord/.Discord-wrapped, which should absolutely make the closure pick it up as well, that's the case for me locally anyways:

[ldesgoui@desktop:~/nixpkgs]$ nix why-depends -f . discord mesa
/nix/store/spy6rbhxlbjj6pah60xw2zh1jjcgfxz5-discord-0.0.13
╚═══opt/Discord/.Discord-wrapped: …f-libdrm-2.4.103/lib:/nix/store/ykhbhngnhp4ar3ghzcp6djqsvs4gi49r-mesa-20.2.2/lib:/nix/store/i7qv…
    => /nix/store/ykhbhngnhp4ar3ghzcp6djqsvs4gi49r-mesa-20.2.2

[ldesgoui@desktop:~/nixpkgs]$ nix why-depends -f . discord libdrm
/nix/store/spy6rbhxlbjj6pah60xw2zh1jjcgfxz5-discord-0.0.13
╚═══opt/Discord/.Discord-wrapped: …rkr-expat-2.2.10/lib:/nix/store/5j88hw0aw0f43z24fv2fscfilpprxl3f-libdrm-2.4.103/lib:/nix/store/y…
    => /nix/store/5j88hw0aw0f43z24fv2fscfilpprxl3f-libdrm-2.4.103

I'm not sure what could be going wrong for you for this to be happening

@leo60228
Copy link
Member

leo60228 commented Dec 5, 2020

For what it's worth, I had the libgbm issue when using the latest discord/default.nix with an outdated discord/base.nix.

jonringer
jonringer approved these changes Dec 5, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM
gui launches fine

1 package built:
discord

@jonringer jonringer merged commit 247e919 into NixOS:master Dec 5, 2020
@SuperSandro2000 SuperSandro2000 mentioned this pull request Dec 5, 2020
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@Chiiruno Chiiruno Chiiruno approved these changes

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

Successfully merging this pull request may close these issues.

None yet
6 participants
@ldesgoui @Chiiruno @SuperSandro2000 @Xe @leo60228 @jonringer