84d4f874c2
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev 78e9caf153f5a339bf1d4c000ff6f0a503a369c8
result/bin/apply-formatting $NIXPKGS_PATH
67 lines
1.5 KiB
Nix
67 lines
1.5 KiB
Nix
{
|
|
lib,
|
|
stdenv,
|
|
fetchFromGitHub,
|
|
fetchurl,
|
|
cmake,
|
|
pkg-config,
|
|
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";
|
|
})
|
|
];
|
|
|
|
# Workaround build failure on -fno-common toolchains like upstream
|
|
# gcc-10. Otherwise build fails as:
|
|
# ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of
|
|
# `wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here
|
|
# TODO: revisit https://github.com/tux4kids/t4kcommon/pull/10 when merged.
|
|
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
|
|
|
nativeBuildInputs = [
|
|
cmake
|
|
pkg-config
|
|
];
|
|
buildInputs = [
|
|
SDL
|
|
SDL_image
|
|
SDL_mixer
|
|
SDL_net
|
|
SDL_ttf
|
|
libpng
|
|
librsvg
|
|
libxml2
|
|
];
|
|
|
|
meta = with lib; {
|
|
description = "Library of code shared between tuxmath and tuxtype";
|
|
homepage = "https://github.com/tux4kids/t4kcommon";
|
|
license = licenses.gpl3Plus;
|
|
maintainers = [ maintainers.aanderse ];
|
|
platforms = platforms.linux;
|
|
};
|
|
}
|