Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d004311ba3e8
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 49be1fad9b73
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 2, 2018

  1. minecraft: Fix versions <1.13 

    (cherry picked from commit 0d2355d)
    @infinisil
    infinisil committed Dec 2, 2018
    Copy the full SHA
    8fc7a2d View commit details

  2. Merge pull request #51374 from Infinisil/backport/fix/minecraft 

    [18.09] minecraft: Fix versions <1.13
    @infinisil
    infinisil authored Dec 2, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    AluisioASG Aluísio Augusto Silva Gonçalves
    GPG key ID: DA6EA2FACDB1CBD2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b3e7183 View commit details

  3. networkmanager-applet: set default icon theme

    @Mic92
    Mic92 committed Dec 2, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    49be1fa View commit details
Showing with 8 additions and 3 deletions.
  1. +7 −2 pkgs/games/minecraft/default.nix
  2. +1 −1 pkgs/tools/networking/network-manager/applet.nix
9 changes: 7 additions & 2 deletions pkgs/games/minecraft/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
, jdk, jre, libpulseaudio
, jdk, jre, libpulseaudio, libXxf86vm
}:

let
@@ -13,6 +13,11 @@ let
categories = "Game;";
};

libPath = stdenv.lib.makeLibraryPath [
libpulseaudio
libXxf86vm # Needed only for versions <1.13
];

in stdenv.mkDerivation {
name = "minecraft-2015-07-24";

@@ -30,7 +35,7 @@ in stdenv.mkDerivation {
makeWrapper ${jre}/bin/java $out/bin/minecraft \
--add-flags "-jar $out/share/minecraft/minecraft.jar" \
--suffix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libpulseaudio ]}
--suffix LD_LIBRARY_PATH : ${libPath}
cp $src $out/share/minecraft/minecraft.jar
cp -r ${desktopItem}/share/applications $out/share
2 changes: 1 addition & 1 deletion pkgs/tools/networking/network-manager/applet.nix
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
polkit isocodes mobile-broadband-provider-info libgudev
modemmanager jansson glib-networking
libappindicator-gtk3
libappindicator-gtk3 gnome3.defaultIconTheme
] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser

nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];