diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix index 3e24ecc3bef2..320119581331 100644 --- a/pkgs/by-name/as/aseprite/package.nix +++ b/pkgs/by-name/as/aseprite/package.nix @@ -8,7 +8,6 @@ fontconfig, freetype, giflib, - gitUpdater, glib, harfbuzzFull, libicns, @@ -33,36 +32,29 @@ zlib, }: +let + asepriteStrings = fetchFromGitHub { + owner = "aseprite"; + repo = "strings"; + rev = "0f49265d7e7aea4b862b7d1e670ed969e8a469b8"; + hash = "sha256-S3YkWA5ECvyyqGvojDhIZci04CTjbJzTQiJ5FZsB4lU="; + }; +in clangStdenv.mkDerivation (finalAttrs: { pname = "aseprite"; - version = "1.3.17"; + version = "1.3.17.2"; - srcs = [ - (fetchFromGitHub { - name = "aseprite-source"; - owner = "aseprite"; - repo = "aseprite"; - tag = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-mBFwcf+Q/h1t7HDuiX6NTAiq0BCZZk6MUid1MuA67LY="; - }) - - # Translation strings - (fetchFromGitHub { - name = "aseprite-strings"; - owner = "aseprite"; - repo = "strings"; - rev = "0f49265d7e7aea4b862b7d1e670ed969e8a469b8"; - hash = "sha256-S3YkWA5ECvyyqGvojDhIZci04CTjbJzTQiJ5FZsB4lU="; - }) - ]; - - # Sets the main build directory to "aseprite-source" since multiple sources are fetched. - sourceRoot = "aseprite-source"; + src = fetchFromGitHub { + owner = "aseprite"; + repo = "aseprite"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-+rLrk/c3WLqNhXQ7J0eeqZ3h4PsbZad61Cxw0RubWgk="; + }; # 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 $PWD/aseprite-strings/* ./aseprite-source/data/strings + cp --no-clobber ${asepriteStrings}/* "$sourceRoot/data/strings" ''; nativeBuildInputs = [ @@ -183,8 +175,6 @@ clangStdenv.mkDerivation (finalAttrs: { rmdir "$out/bin" 2>/dev/null || true ''; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = { homepage = "https://www.aseprite.org/"; description = "Animated sprite editor & pixel art tool";