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

minecraft: use makeLibraryPath, so we don't use the dev outputs #15124

Merged
merged 1 commit into from
May 2, 2016
Merged

minecraft: use makeLibraryPath, so we don't use the dev outputs #15124

merged 1 commit into from
May 2, 2016

Conversation

edef1c
Copy link
Member

@edef1c edef1c commented Apr 30, 2016

Right now it ends up using the .dev outputs, due to fallout from closure-size, and breaks hard.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • 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

By analyzing the blame information on this pull request, we identified @shlevy, @cpages and @ryantm to be potential reviewers

@joachifm joachifm added 0.kind: bug Something is broken 6.topic: closure size The final size of a derivation, including its dependencies labels Apr 30, 2016
@edef1c
Copy link
Member Author

edef1c commented May 1, 2016

It's worth noting that this is, by itself, already a useful refactoring, independent of whatever we do to the order of outputs.

@@ -39,8 +40,7 @@ in stdenv.mkDerivation {
cat > $out/bin/minecraft << EOF
#!${stdenv.shell}

# wrapper for minecraft
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libXext libXcursor libXrandr libXxf86vm mesa openal ]}
Copy link
Member

Choose a reason for hiding this comment

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

Is libX11 not needed anymore?

Copy link
Member Author

Choose a reason for hiding this comment

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

didn't appear to be, no — Minecraft runs fine here.

@edef1c
Copy link
Member Author

edef1c commented May 2, 2016

Readded libX11 just in case old Minecraft releases rely on it (since the version selector in the launcher allows you to play older releases)

@abbradar abbradar merged commit 8297d2c into NixOS:master May 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: bug Something is broken 6.topic: closure size The final size of a derivation, including its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants