From 05eb7ba6e4105d5efa0501b19b1e51ffb3c2f779 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 11 Sep 2017 23:44:33 +0000 Subject: aseprite: 0.9.5 -> 1.1.7 --- pkgs/applications/editors/aseprite/default.nix | 56 +++++++++++++------------- 1 file changed, 29 insertions(+), 27 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 9945fd53719b..a04139d58591 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,47 +1,49 @@ -{ stdenv, fetchurl, cmake, pkgconfig -, giflib, libjpeg, zlib, libpng, tinyxml, allegro -, libX11, libXext, libXcursor, libXpm, libXxf86vm, libXxf86dga +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib +, libX11, libXext, libXcursor, libXxf86vm }: stdenv.mkDerivation rec { - name = "aseprite-0.9.5"; + name = "aseprite-${version}"; + version = "1.1.7"; - src = fetchurl { - url = "http://aseprite.googlecode.com/files/${name}.tar.xz"; - sha256 = "0m7i6ybj2bym4w9rybacnnaaq2jjn76vlpbp932xcclakl6kdq41"; + src = fetchFromGitHub { + owner = "aseprite"; + repo = "aseprite"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ - cmake pkgconfig - giflib libjpeg zlib libpng tinyxml allegro - libX11 libXext libXcursor libXpm libXxf86vm libXxf86dga + curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib + libX11 libXext libXcursor libXxf86vm ]; - patchPhase = '' - sed -i '/^find_unittests/d' src/CMakeLists.txt - sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt - sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt - sed -i 's/png_\(sizeof\)/\1/g' src/file/png_format.cpp - ''; - cmakeFlags = '' + -DENABLE_UPDATER=OFF + -DUSE_SHARED_CURL=ON + -DUSE_SHARED_FREETYPE=ON -DUSE_SHARED_GIFLIB=ON -DUSE_SHARED_JPEGLIB=ON - -DUSE_SHARED_ZLIB=ON -DUSE_SHARED_LIBPNG=ON - -DUSE_SHARED_LIBLOADPNG=ON + -DUSE_SHARED_LIBWEBP=ON + -DUSE_SHARED_PIXMAN=ON -DUSE_SHARED_TINYXML=ON - -DUSE_SHARED_GTEST=ON - -DUSE_SHARED_ALLEGRO4=ON - -DENABLE_UPDATER=OFF + -DUSE_SHARED_ZLIB=ON + -DWITH_DESKTOP_INTEGRATION=ON + -DWITH_WEBP_SUPPORT=ON ''; - NIX_LDFLAGS = "-lX11"; + enableParallelBuilding = true; - meta = { - description = "Animated sprite editor & pixel art tool"; + meta = with stdenv.lib; { homepage = https://www.aseprite.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + description = "Animated sprite editor & pixel art tool"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; }; } -- cgit 1.4.1 From f0483d59f359029e8f26f8bc9d5f08100bc90acd Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 12 Sep 2017 00:29:00 +0000 Subject: aseprite unfree: init at 1.2-beta12 --- pkgs/applications/editors/aseprite/default.nix | 57 ++++++++++++++++++-------- 1 file changed, 39 insertions(+), 18 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index a04139d58591..420829199e14 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,18 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , libX11, libXext, libXcursor, libXxf86vm +, unfree ? false +, cmark }: +# Unfree version is not redistributable: +# https://dev.aseprite.org/2016/09/01/new-source-code-license/ +# Consider supporting the developer: https://aseprite.org/#buy + stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = "1.1.7"; + version = if unfree then "1.2-beta12" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; + sha256 = if unfree + then "1zgsr03d4vwdj2qyiwfwfqsbqngp85n13i3xwbkfkbja036c5yhc" + else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -20,29 +28,42 @@ stdenv.mkDerivation rec { buildInputs = [ curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm + ] ++ lib.optionals unfree [ cmark ]; + + cmakeFlags = [ + "-DENABLE_UPDATER=OFF" + "-DUSE_SHARED_CURL=ON" + "-DUSE_SHARED_FREETYPE=ON" + "-DUSE_SHARED_GIFLIB=ON" + "-DUSE_SHARED_JPEGLIB=ON" + "-DUSE_SHARED_LIBPNG=ON" + "-DUSE_SHARED_LIBWEBP=ON" + "-DUSE_SHARED_PIXMAN=ON" + "-DUSE_SHARED_TINYXML=ON" + "-DUSE_SHARED_ZLIB=ON" + "-DWITH_DESKTOP_INTEGRATION=ON" + "-DWITH_WEBP_SUPPORT=ON" + ] ++ lib.optionals unfree [ + "-DUSE_SHARED_CMARK=ON" + # Aseprite needs internal freetype headers. + "-DUSE_SHARED_FREETYPE=OFF" + # Disable libarchive programs. + "-DENABLE_CAT=OFF" + "-DENABLE_CPIO=OFF" + "-DENABLE_TAR=OFF" ]; - cmakeFlags = '' - -DENABLE_UPDATER=OFF - -DUSE_SHARED_CURL=ON - -DUSE_SHARED_FREETYPE=ON - -DUSE_SHARED_GIFLIB=ON - -DUSE_SHARED_JPEGLIB=ON - -DUSE_SHARED_LIBPNG=ON - -DUSE_SHARED_LIBWEBP=ON - -DUSE_SHARED_PIXMAN=ON - -DUSE_SHARED_TINYXML=ON - -DUSE_SHARED_ZLIB=ON - -DWITH_DESKTOP_INTEGRATION=ON - -DWITH_WEBP_SUPPORT=ON + postInstall = lib.optionalString unfree '' + # Delete unneeded artifacts of bundled libraries. + rm -rf $out/include $out/lib ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://www.aseprite.org/; description = "Animated sprite editor & pixel art tool"; - license = licenses.gpl2; + license = if unfree then licenses.unfree else licenses.gpl2; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; }; -- cgit 1.4.1 From 247fa20962ec3c085dad0d53f50cbef46a01f30c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 12 Sep 2017 04:50:16 +0000 Subject: aseprite: install desktop icons --- pkgs/applications/editors/aseprite/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 420829199e14..9a0d1bb5e72c 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -53,9 +53,16 @@ stdenv.mkDerivation rec { "-DENABLE_TAR=OFF" ]; - postInstall = lib.optionalString unfree '' + postInstall = '' + # Install desktop icons. + src="$out/share/aseprite/data/icons" + for size in 16 32 48 64; do + dst="$out"/share/icons/hicolor/"$size"x"$size" + install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png + install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png + done # Delete unneeded artifacts of bundled libraries. - rm -rf $out/include $out/lib + rm -rf "$out"/include "$out"/lib ''; enableParallelBuilding = true; -- cgit 1.4.1