Unverified Commit 04d2d064 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #322654 from wegank/papermc-darwin 

minecraft-server, papermc: restore darwin support
parents 0ff0a7bf f6d566f5

pkgs/games/minecraft-servers/derivation.nix

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ stdenv.mkDerivation { 


    makeWrapper ${lib.getExe jre_headless} $out/bin/minecraft-server \

      --append-flags "-jar $out/lib/minecraft/server.jar nogui" \

      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}

      ${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"}



    runHook postInstall

  '';

pkgs/games/papermc/derivation.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


    makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \

      --append-flags "-jar $out/share/papermc/papermc.jar nogui" \

      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}

      ${lib.optionalString stdenvNoCC.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"}



    runHook postInstall

  '';