From 14627acc57a8e54ea495512d76d5fba47d465731 Mon Sep 17 00:00:00 2001 From: Ruben Astudillo Date: Sat, 9 Mar 2019 05:54:05 -0300 Subject: [PATCH 1/2] Revert "stepmania: switch to clangStdenv" This reverts commit ff6e4b44dc55ea3d7e0b1331621ea3f67b5e6a69. --- pkgs/games/stepmania/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 75d28d46776..4f9406abd83 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,9 +1,9 @@ -{ clangStdenv, lib, fetchFromGitHub, cmake, nasm +{ stdenv, lib, fetchFromGitHub, cmake, nasm , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: -clangStdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "stepmania-${version}"; version = "5.0.12"; From 8bbe67158532d97fb5096839d8a1dd003280318c Mon Sep 17 00:00:00 2001 From: Ruben Astudillo Date: Sun, 3 Mar 2019 02:03:51 -0300 Subject: [PATCH 2/2] stepmania: 5.0.12 -> 5.1.0-b2 --- pkgs/games/stepmania/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 4f9406abd83..86488874166 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "stepmania-${version}"; - version = "5.0.12"; + version = "5.1.0-b2"; src = fetchFromGitHub { owner = "stepmania"; repo = "stepmania"; rev = "v${version}"; - sha256 = "0ig5pnw78j45b35kfr76phaqbac9b2f6wg3c63l6mf0nrq17wslz"; + sha256 = "0a7y9l7xm510vgnpmj1is7p9m6d6yd0fcaxrjcickz295k5w3rdn"; }; nativeBuildInputs = [ cmake nasm ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin - ln -s $out/stepmania-5.0/stepmania $out/bin/stepmania + ln -s $out/stepmania-5.1/stepmania $out/bin/stepmania ''; enableParallelBuilding = true;