diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix deleted file mode 100644 index 1981d3474d1..00000000000 --- a/pkgs/games/super-tux/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer -, curl, gettext, libogg, libvorbis, mesa, openal, physfs, boost, glew -, libiconv }: - -stdenv.mkDerivation rec { - name = "supertux-${version}"; - version = "0.4.0"; - - src = fetchurl { - url = https://github.com/SuperTux/supertux/releases/download/v0.4.0/supertux-0.4.0.tar.bz2; - sha256 = "10ppmy6w77lxj8bdzjahc9bidgl4qgzr9rimn15rnqay84ydx3fi"; - }; - - buildInputs = [ pkgconfig cmake SDL2 SDL2_image SDL2_mixer curl gettext - libogg libvorbis mesa openal physfs boost glew libiconv ]; - - postInstall = '' - mkdir $out/bin - ln -s $out/games/supertux2 $out/bin - ''; - - meta = with stdenv.lib; { - description = "Classic 2D jump'n run sidescroller game"; - homepage = http://supertux.github.io/; - license = licenses.gpl2; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix new file mode 100644 index 00000000000..043861b6166 --- /dev/null +++ b/pkgs/games/supertux/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl +, libogg, libvorbis, mesa, openal, boost, glew +}: + +stdenv.mkDerivation rec { + name = "supertux-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; + sha256 = "0fx7c7m6mfanqy7kln7yf6abb5l3r68picf32js2yls11jj0vbng"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis mesa openal boost glew ]; + + cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; + + postInstall = '' + mkdir $out/bin + ln -s $out/games/supertux2 $out/bin + ''; + + meta = with stdenv.lib; { + description = "Classic 2D jump'n run sidescroller game"; + homepage = http://supertux.github.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26da571d18e..df90cc100fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15583,7 +15583,7 @@ in }; }; - superTux = callPackage ../games/super-tux { }; + superTux = callPackage ../games/supertux { }; superTuxKart = callPackage ../games/super-tux-kart { };