public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aseprite-unfree: 1.2.4 -> 1.2.9

Browse Source
This commit is contained in:
Orivej Desh 2018-09-10 02:39:28 +00:00
parent cdce8f9034
commit 78bc2f9800
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/editors/aseprite/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig { stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig
, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
, libX11, libXext, libXcursor, libXxf86vm , libX11, libXext, libXcursor, libXxf86vm
, unfree ? false , unfree ? false
, cmark , cmark
@ -11,7 +11,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "aseprite-${version}"; 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 { src = fetchFromGitHub {
owner = "aseprite"; owner = "aseprite";
@ -19,16 +19,27 @@ stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = if unfree sha256 = if unfree
then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3" then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd"
else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib
libX11 libXext libXcursor libXxf86vm 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 = '' postPatch = ''
sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-"
@ -49,6 +60,7 @@ stdenv.mkDerivation rec {
"-DWITH_WEBP_SUPPORT=ON" "-DWITH_WEBP_SUPPORT=ON"
] ++ lib.optionals unfree [ ] ++ lib.optionals unfree [
"-DUSE_SHARED_CMARK=ON" "-DUSE_SHARED_CMARK=ON"
"-DUSE_SHARED_HARFBUZZ=ON"
# Aseprite needs internal freetype headers. # Aseprite needs internal freetype headers.
"-DUSE_SHARED_FREETYPE=OFF" "-DUSE_SHARED_FREETYPE=OFF"
# Disable libarchive programs. # Disable libarchive programs.