diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-09-10 02:39:28 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-09-10 03:01:36 +0000 |
| commit | 78bc2f9800db2036471963702e038b4f9371593d (patch) | |
| tree | fea3ac8c9d610144ddc89fd488cd5a5127a26c5a | |
| parent | cdce8f9034c16c689f835852f9e10b286e0c31b9 (diff) | |
| download | nixlib-78bc2f9800db2036471963702e038b4f9371593d.tar nixlib-78bc2f9800db2036471963702e038b4f9371593d.tar.gz nixlib-78bc2f9800db2036471963702e038b4f9371593d.tar.bz2 nixlib-78bc2f9800db2036471963702e038b4f9371593d.tar.lz nixlib-78bc2f9800db2036471963702e038b4f9371593d.tar.xz nixlib-78bc2f9800db2036471963702e038b4f9371593d.tar.zst nixlib-78bc2f9800db2036471963702e038b4f9371593d.zip | |
aseprite-unfree: 1.2.4 -> 1.2.9
| -rw-r--r-- | pkgs/applications/editors/aseprite/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 429b2430fce2..7af3742349a6 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig +, curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , libX11, libXext, libXcursor, libXxf86vm , unfree ? false , cmark @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = if unfree then "1.2.4" else "1.1.7"; + version = if unfree then "1.2.9" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,16 +19,27 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3" + then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib + curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark ]; + ] ++ lib.optionals unfree [ cmark harfbuzz ]; + + patches = lib.optionals unfree [ + (fetchpatch { + url = "https://github.com/aseprite/aseprite/commit/cfb4dac6feef1f39e161c23c886055a8f9acfd0d.patch"; + sha256 = "1qhjfpngg8b1vvb9w26lhjjfamfx57ih0p31km3r5l96nm85l7f9"; + }) + (fetchpatch { + url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; + sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91"; + }) + ]; postPatch = '' sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" @@ -49,6 +60,7 @@ stdenv.mkDerivation rec { "-DWITH_WEBP_SUPPORT=ON" ] ++ lib.optionals unfree [ "-DUSE_SHARED_CMARK=ON" + "-DUSE_SHARED_HARFBUZZ=ON" # Aseprite needs internal freetype headers. "-DUSE_SHARED_FREETYPE=OFF" # Disable libarchive programs. |