diff options
author | Robin Gloster <mail@glob.in> | 2017-08-12 14:01:08 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-08-12 14:01:08 +0200 |
commit | a33dfc86f3c63b377951a41efdfea8e1a4d3aafe (patch) | |
tree | 011883f111777e526e26f39776a8a3126fa2396d /pkgs/games | |
parent | 79ac09ea06da73281140afbd46e1464675d7285b (diff) | |
download | nixlib-a33dfc86f3c63b377951a41efdfea8e1a4d3aafe.tar nixlib-a33dfc86f3c63b377951a41efdfea8e1a4d3aafe.tar.gz nixlib-a33dfc86f3c63b377951a41efdfea8e1a4d3aafe.tar.bz2 nixlib-a33dfc86f3c63b377951a41efdfea8e1a4d3aafe.tar.lz nixlib-a33dfc86f3c63b377951a41efdfea8e1a4d3aafe.tar.xz nixlib-a33dfc86f3c63b377951a41efdfea8e1a4d3aafe.tar.zst nixlib-a33dfc86f3c63b377951a41efdfea8e1a4d3aafe.zip |
ultrastardx: 1.1, 1.3-beta -> 2017.8.0
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/ultrastardx/1.1.nix | 32 | ||||
-rw-r--r-- | pkgs/games/ultrastardx/default.nix (renamed from pkgs/games/ultrastardx/1.3-beta.nix) | 10 |
2 files changed, 4 insertions, 38 deletions
diff --git a/pkgs/games/ultrastardx/1.1.nix b/pkgs/games/ultrastardx/1.1.nix deleted file mode 100644 index 9810d5186b0e..000000000000 --- a/pkgs/games/ultrastardx/1.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, pkgconfig, lua, fpc, pcre, portaudio, freetype, libpng -, SDL, SDL_image, ffmpeg, sqlite, zlib, libX11 }: - -stdenv.mkDerivation rec { - name = "ultrastardx-1.1"; - src = fetchurl { - url = "mirror://sourceforge/ultrastardx/${name}-src.tar.gz"; - sha256 = "0sfj5rfgj302avcp6gj5hiypcxms1wc6h3qzjaf5i2a9kcvnibcd"; - }; - - buildInputs = [ pkgconfig fpc pcre portaudio freetype libpng SDL SDL_image ffmpeg - sqlite lua ]; - - - # The fpc is not properly wrapped to add -rpath. I add this manually. - # I even do a trick on lib/lib64 for libgcc, that I expect it will work. - preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib" - - sed -i 414,424d Makefile - ''; - - # dlopened libgcc requires the rpath not to be shrinked - dontPatchELF = true; - - meta = { - homepage = http://ultrastardx.sourceforge.net/; - description = "Free and open source karaoke game"; - license = stdenv.lib.licenses.gpl2Plus; - broken = true; - }; -} diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/default.nix index ca7d6b35a21b..ce68f190992b 100644 --- a/pkgs/games/ultrastardx/1.3-beta.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -12,18 +12,16 @@ let in stdenv.mkDerivation rec { name = "ultrastardx-${version}"; - version = "1.3.5-beta"; + version = "2017.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn"; + sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm"; }; - buildInputs = [ - pkgconfig autoreconfHook - fpc libpng - ] ++ sharedLibs; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ fpc libpng ] ++ sharedLibs; postPatch = '' # autoconf substitutes strange things otherwise |