nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

libresprite: 1.0 -> 1.1

Browse Source 
(cherry picked from commit 6fa830fc0d)
This commit is contained in:
Marcin Serwin 2024-11-17 15:07:57 +01:00 committed by github-actions[bot]
parent 8ebbdd9318
commit 23b4e4f5b7
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/libresprite.nix
View File

@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.wait_for_x() machine.wait_for_x()
machine.succeed("convert -font DejaVu-Sans +antialias label:'IT WORKS' image.png") machine.succeed("convert -font DejaVu-Sans +antialias label:'IT WORKS' image.png")
machine.execute("libresprite image.png >&2 &") machine.execute("libresprite image.png >&2 &")
machine.wait_for_window("LibreSprite v${pkgs.libresprite.version}") machine.wait_for_window("LibreSprite ${pkgs.libresprite.version}-dev")
machine.wait_for_text("IT WORKS") machine.wait_for_text("IT WORKS")
machine.screenshot("screen") machine.screenshot("screen")
''; '';

28
pkgs/applications/editors/libresprite/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, pkg-config , pkg-config
@ -14,8 +13,9 @@
, libjpeg , libjpeg
, libpng , libpng
, libwebp , libwebp
, libarchive
, pixman , pixman
, tinyxml , tinyxml-2
, zlib , zlib
, SDL2 , SDL2
, SDL2_image , SDL2_image
@ -29,25 +29,16 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "libresprite"; pname = "libresprite";
version = "1.0"; version = "1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LibreSprite"; owner = "LibreSprite";
repo = "LibreSprite"; repo = "LibreSprite";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; hash = "sha256-piA/hLQqdfyVH4GPu5ElXZtowQL9AGaK7GhZOME4L0Q=";
}; };
# Backport GCC 13 build fix
# FIXME: remove in next release
patches = [
(fetchpatch {
url = "https://github.com/LibreSprite/LibreSprite/commit/6ffe8472194bf5d0a73b4b2cd7f6804d3c80aa0c.patch";
hash = "sha256-5chXt0H+koofIspYsCJ7/eUxMGcCBVXJcXe3U/7F9Vc=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
@ -62,8 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
libjpeg libjpeg
libpng libpng
libwebp libwebp
libarchive
pixman pixman
tinyxml tinyxml-2
zlib zlib
SDL2 SDL2
SDL2_image SDL2_image
@ -95,10 +87,10 @@ stdenv.mkDerivation (finalAttrs: {
libresprite-can-open-png = nixosTests.libresprite; libresprite-can-open-png = nixosTests.libresprite;
}; };
meta = with lib; { meta = {
homepage = "https://libresprite.github.io/"; homepage = "https://libresprite.github.io/";
description = "Animated sprite editor & pixel art tool, fork of Aseprite"; description = "Animated sprite editor & pixel art tool, fork of Aseprite";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
longDescription = '' longDescription = ''
LibreSprite is a program to create animated sprites. Its main features are: LibreSprite is a program to create animated sprites. Its main features are:
@ -113,8 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
- Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc.
- Onion skinning. - Onion skinning.
''; '';
maintainers = with maintainers; [ fgaz ]; maintainers = with lib.maintainers; [ fgaz ];
platforms = platforms.all; platforms = lib.platforms.all;
# https://github.com/LibreSprite/LibreSprite/issues/308 # https://github.com/LibreSprite/LibreSprite/issues/308
broken = stdenv.hostPlatform.isDarwin; broken = stdenv.hostPlatform.isDarwin;
}; };