aseprite: rebase to latest stable
This commit is contained in:
@@ -32,30 +32,29 @@
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
asepriteStrings = fetchFromGitHub {
|
||||
owner = "aseprite";
|
||||
repo = "strings";
|
||||
rev = "417074f649f359f98511fc87a707c276d87f5739";
|
||||
hash = "sha256-5bB7yK4eJHhkUwGYtIFYdFXpRrBt69VBbTh7EmPFI08=";
|
||||
};
|
||||
in
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aseprite";
|
||||
version = "44cd42d29dbc047ec9d341f05c0a8ff584ede151";
|
||||
version = "1.3.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aseprite";
|
||||
repo = "aseprite";
|
||||
rev = "${finalAttrs.version}";
|
||||
hash = "sha256-swXk8wwFgao2rpF4ntCjOMnV+yk0gi+wbWoWl/wv7e8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-pMjBFJ1nhSNLITDS4oliD2DPMey6JBWplIqdcOtZfqM=";
|
||||
};
|
||||
|
||||
# Translation files are copied without overwriting existing ones to preserve the
|
||||
# potentially more up-to-date English file from the main source.
|
||||
asepriteStrings = fetchFromGitHub {
|
||||
owner = "aseprite";
|
||||
repo = "strings";
|
||||
rev = "b43be33343efa40c1c4bda00f985b8cd83bddf2a";
|
||||
hash = "sha256-JxNEtWnP3RtntXM3CmJLXyByW6dri98COp2O0A6ZwBA=";
|
||||
};
|
||||
|
||||
# Translation files are copied without overwriting existing ones to preserve
|
||||
# the potentially more up-to-date English file from the main source.
|
||||
postUnpack = ''
|
||||
cp --no-clobber ${asepriteStrings}/* "$sourceRoot/data/strings"
|
||||
cp --no-clobber ${finalAttrs.asepriteStrings}/* "$sourceRoot/data/strings"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -105,8 +104,12 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace src/ver/CMakeLists.txt \
|
||||
--replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
|
||||
|
||||
# Fix build on Darwin with `-Werror=format-security`.
|
||||
# (NSLog requires a string-literal format).
|
||||
# fmt 12.2 no longer exposes fmt::format through fmt/core.h.
|
||||
substituteInPlace src/app/i18n/strings.h \
|
||||
--replace-fail '"fmt/core.h"' '"fmt/format.h"'
|
||||
|
||||
# Fix build on Darwin with `-Werror=format-security`
|
||||
# (NSLog requires a string-literal format)
|
||||
substituteInPlace laf/os/osx/logger.mm \
|
||||
--replace-fail 'NSLog([NSString stringWithUTF8String:error]);' 'NSLog(@"%@", [NSString stringWithUTF8String:error]);'
|
||||
'';
|
||||
@@ -176,11 +179,12 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
rmdir "$out/bin" 2>/dev/null || true
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.aseprite.org/";
|
||||
description = "Animated sprite editor & pixel art tool";
|
||||
license = lib.licenses.unfree;
|
||||
|
||||
longDescription = ''
|
||||
Aseprite is a program to create animated sprites. Its main features are:
|
||||
- Sprites are composed by layers & frames (as separated concepts).
|
||||
@@ -194,7 +198,6 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
- Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc.
|
||||
- Onion skinning.
|
||||
'';
|
||||
|
||||
maintainers = [ lib.maintainers.iamanaws ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "aseprite";
|
||||
|
||||
Reference in New Issue
Block a user