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

Commits on Nov 26, 2020

  1. voxelands: 1512.00 -> 1704.00

    prusnak committed Nov 26, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    1ed49e3 View commit details

Commits on Nov 27, 2020

  1. Merge pull request #104705 from prusnak/voxelands

    voxelands: 1512.00 -> 1704.00
    doronbehar authored Nov 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2a84a49 View commit details
Showing with 42 additions and 9 deletions.
  1. +42 −9 pkgs/games/voxelands/default.nix
51 changes: 42 additions & 9 deletions pkgs/games/voxelands/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,30 @@
{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite
, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, xlibsWrapper, pkgconfig }:
{ stdenv
, fetchFromGitLab
, bzip2
, cmake
, expat
, irrlicht
, libGL
, libGLU
, libXxf86vm
, libjpeg
, libpng
, libvorbis
, openal
, pkg-config
, sqlite
, xlibsWrapper
}:

stdenv.mkDerivation rec {
pname = "voxelands";
version = "1512.00";
version = "1704.00";

src = fetchurl {
url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2";
sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = version;
sha256 = "0yj9z9nygpn0z63y739v72l3kg81wd71xgix5k045vfzhqsam5m0";
};

cmakeFlags = [
@@ -16,16 +33,32 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
];

nativeBuildInputs = [
cmake
pkg-config
];

buildInputs = [
cmake irrlicht libpng bzip2 libjpeg sqlite
libXxf86vm libGLU libGL openal libvorbis xlibsWrapper pkgconfig
bzip2
expat
irrlicht
libGL
libGLU
libXxf86vm
libjpeg
libpng
libvorbis
openal
sqlite
xlibsWrapper
];

meta = with stdenv.lib; {
homepage = "http://voxelands.com/";
homepage = "https://voxelands.net/";
description = "Infinite-world block sandbox game based on Minetest";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
broken = stdenv.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'"
};
}