JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tuxtype: switch the src location, update .nix file to reflect changes

Browse Source
This commit is contained in:
Aaron Andersen 2019-02-15 21:42:18 -05:00
parent d01f931b9b
commit 773bd62dc9
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/games/t4kcommon/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }:
stdenv.mkDerivation rec {
version = "0.1.1";
pname = "t4kcommon";
src = fetchFromGitHub {
owner = "tux4kids";
repo = "t4kcommon";
rev = "upstream/${version}";
sha256 = "13q02xpmps9qg8zrzzy2gzv4a6afgi28lxk4z242j780v0gphchp";
};
patches = [
# patch from debian to support libpng16 instead of libpng12
(fetchurl {
url = "https://salsa.debian.org/tux4kids-pkg-team/t4kcommon/raw/f7073fa384f5a725139f54844e59b57338b69dc7/debian/patches/libpng16.patch";
sha256 = "1lcpkdy5gvxgljg1vkrxych74amq0gramb1snj2831dam48is054";
})
];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ];
meta = with stdenv.lib; {
description = "A library of code shared between tuxmath and tuxtype.";
homepage = https://github.com/tux4kids/t4kcommon;
license = licenses.gpl3Plus;
maintainers = [ maintainers.aanderse ];
platforms = platforms.linux;
};
}

26
pkgs/games/tuxtype/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl, pkgconfig, librsvg, SDL, SDL_image, SDL_mixer, SDL_ttf }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, librsvg, libxml2, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, t4kcommon }:
stdenv.mkDerivation rec {
version = "1.8.3";
name = "tuxtype-${version}";
pname = "tuxtype";
src = fetchurl {
url = "https://github.com/tux4kids/tuxtype/archive/upstream/${version}.tar.gz";
sha256 = "0cv935ir14cd2c8bgsxxpi6id04f61170gslakmwhxn6r3pbw0lp";
src = fetchFromGitHub {
owner = "tux4kids";
repo = "tuxtype";
rev = "upstream/${version}";
sha256 = "1i33rhi9gpzfml4hd73s18h6p2s8zcr26va2vwf2pqqd9fhdwpsg";
};
patchPhase = ''
postPatch = ''
patchShebangs data/scripts/sed-linux.sh
patchShebangs data/themes/asturian/scripts/sed-linux.sh
patchShebangs data/themes/greek/scripts/sed-linux.sh
@ -19,13 +21,15 @@ stdenv.mkDerivation rec {
--replace "\$(MKDIR_P) -m 2755 " "\$(MKDIR_P) -m 755 " \
--replace "chown root:games \$(DESTDIR)\$(pkglocalstatedir)/words" " "
substituteInPlace Makefile.in \
--replace "\$(MKDIR_P) -m 2755 " "\$(MKDIR_P) -m 755 " \
--replace "chown root:games \$(DESTDIR)\$(pkglocalstatedir)/words" " "
# required until the following has been merged:
# https://salsa.debian.org/tux4kids-pkg-team/tuxtype/merge_requests/1
substituteInPlace configure.ac \
--replace 'CFLAGS="$CFLAGS $SDL_IMAGE"' 'CFLAGS="$CFLAGS $SDL_IMAGE_CFLAGS"' \
--replace 'PKG_CHECK_MODULES([SDL_ttf],' 'PKG_CHECK_MODULES([SDL_TTF],'
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ librsvg SDL SDL_image SDL_mixer SDL_ttf ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ librsvg libxml2 SDL SDL_image SDL_mixer SDL_net SDL_ttf t4kcommon ];
configureFlags = [ "--without-sdlpango" ];

2
pkgs/top-level/all-packages.nix
View File

@ -21099,6 +21099,8 @@ in
synthv1 = callPackage ../applications/audio/synthv1 { };
t4kcommon = callPackage ../games/t4kcommon { };
tcl2048 = callPackage ../games/tcl2048 { };
the-powder-toy = callPackage ../games/the-powder-toy {