diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 99bafe95b75..0ec52cc5804 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,40 +1,44 @@ -{ fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib -, libpulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk -, mesa, glew }: +{ stdenv, lib, fetchFromGitHub, cmake, nasm +, gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis +, glew, libpulseaudio +}: stdenv.mkDerivation rec { name = "stepmania-${version}"; - version = "5.0.7"; + version = "5.0.10"; src = fetchFromGitHub { owner = "stepmania"; repo = "stepmania"; rev = "v${version}"; - sha256 = "1lagnk8x72v5jazcbb39237fi33kp5zgg22fxw7zmvr4qwqiqbz9"; + sha256 = "174gzvk42gwm56hpkz51csad9xi4dg466xv0mf1z39xd7mqd5j5w"; }; + nativeBuildInputs = [ cmake nasm ]; + buildInputs = [ - pkgconfig autoconf automake yasm zlib bzip2 alsaLib libpulseaudio libmad libtheora - libvorbis libpng libjpeg gtk mesa glew + gtk2 glib ffmpeg alsaLib libmad libogg libvorbis + glew libpulseaudio ]; - preConfigure = '' - substituteInPlace autoconf/m4/video.m4 \ - --replace './configure $FFMPEG_CONFFLAGS' './configure --prefix='$out' $FFMPEG_CONFFLAGS' - - ./autogen.sh - ''; + cmakeFlags = [ + "-DWITH_SYSTEM_FFMPEG=1" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + ]; postInstall = '' mkdir -p $out/bin - echo "#!/bin/sh" > $out/bin/stepmania - echo "export LD_LIBRARY_PATH=$out/stepmania-5.0:${alsaLib}/lib:\$LD_LIBRARY_PATH" >> $out/bin/stepmania - echo "exec $out/stepmania-5.0/stepmania" >> $out/bin/stepmania - chmod +x $out/bin/stepmania + ln -s $out/stepmania-5.0/stepmania $out/bin/stepmania ''; - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.mornfall ]; + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://www.stepmania.com/"; + description = "Free dance and rhythm game for Windows, Mac, and Linux"; + platforms = platforms.linux; + license = licenses.mit; # expat version + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e1542af8c..8eaa648ed3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14153,7 +14153,7 @@ let withPrimus = config.steam.primus or false; }; - stepmania = callPackage ../games/stepmania {}; + stepmania = callPackage ../games/stepmania { }; stuntrally = callPackage ../games/stuntrally { };