Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 25bf5520bdc0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5562bd8f4584
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 11, 2020

  1. minetest: 5.2.0 -> 5.3.0

    @freezeboy
    freezeboy committed Jul 11, 2020
    Copy the full SHA
    bda4377 View commit details

  2. Merge pull request #92932 from freezeboy/update-minetest 

    minetest: 5.2.0 -> 5.3.0
    @fpletz
    fpletz authored Jul 11, 2020
    Copy the full SHA
    5562bd8 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/games/minetest/default.nix
10 changes: 5 additions & 5 deletions pkgs/games/minetest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,15 +39,15 @@ let
] ++ optionals buildClient [
"-DOpenGL_GL_PREFERENCE=GLVND"
];

NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3

nativeBuildInputs = [ cmake doxygen graphviz ];

buildInputs = [
irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
gmp libspatialindex
] ++ optionals stdenv.isDarwin [
] ++ optionals stdenv.isDarwin [
libiconv OpenGL OpenAL Carbon Cocoa
] ++ optionals buildClient [
libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm
@@ -76,9 +76,9 @@ let
};

v5 = {
version = "5.2.0";
sha256 = "0pj9hkxwc1vzng2khbixi79557sbawf6mqkzl589jciyqa7jqkv1";
dataSha256 = "1kjz7x3xiqqnpyrd6339a139pbdxx31c4qpg8pmns410hsm8i358";
version = "5.3.0";
sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6";
dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx";
};

in {