3
0
Fork 0
forked from mirrors/nixpkgs

ultrastardx: 1.1, 1.3-beta -> 2017.8.0

This commit is contained in:
Robin Gloster 2017-08-12 14:01:08 +02:00
parent 79ac09ea06
commit a33dfc86f3
No known key found for this signature in database
GPG key ID: 5E4C836C632C2882
4 changed files with 6 additions and 46 deletions

View file

@ -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;
};
}

View file

@ -12,18 +12,16 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "ultrastardx-${version}"; name = "ultrastardx-${version}";
version = "1.3.5-beta"; version = "2017.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "UltraStar-Deluxe"; owner = "UltraStar-Deluxe";
repo = "USDX"; repo = "USDX";
rev = "v${version}"; rev = "v${version}";
sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn"; sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm";
}; };
buildInputs = [ nativeBuildInputs = [ pkgconfig autoreconfHook ];
pkgconfig autoreconfHook buildInputs = [ fpc libpng ] ++ sharedLibs;
fpc libpng
] ++ sharedLibs;
postPatch = '' postPatch = ''
# autoconf substitutes strange things otherwise # autoconf substitutes strange things otherwise

View file

@ -139,6 +139,7 @@ mapAliases (rec {
telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19
tftp_hpa = tftp-hpa; # added 2015-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03
ucsFonts = ucs-fonts; # added 2016-07-15 ucsFonts = ucs-fonts; # added 2016-07-15
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10 usb_modeswitch = usb-modeswitch; # added 2016-05-10
vimbWrapper = vimb; # added 2015-01 vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01

View file

@ -17569,14 +17569,7 @@ with pkgs;
ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
ultrastardx = callPackage ../games/ultrastardx/1.1.nix { ultrastardx = callPackage ../games/ultrastardx/default.nix { };
ffmpeg = ffmpeg_0;
lua = lua5;
};
ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix {
ffmpeg = ffmpeg_0;
lua = lua5;
};
unnethack = callPackage ../games/unnethack { }; unnethack = callPackage ../games/unnethack { };