aseprite: drop free version and alias to unfree version

The free version of Aseprite has a maintained fork, LibreSprite which is
already packaged in nixpkgs. The only really useful version of Aseprite
vs LibreSprite is the unfree version, and the free version will never
receive updates.

2 files changed, 8 insertions, 28 deletions

diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch
deleted file mode 100644
index 94c70da276c94..0000000000000
--- a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
-index 4909ff1..02fa145 100644
---- a/src/she/CMakeLists.txt
-+++ b/src/she/CMakeLists.txt
-@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND)
-     add_definitions(-DUSE_MOUSE_POLLER)

-+    add_definitions(-DALLEGRO_NO_FIX_ALIASES)

-   endif()

diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 99a1c8adec435..36415d076d9d8 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -2,7 +2,6 @@
 , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
 , harfbuzzFull, glib, fontconfig, pcre
 , libX11, libXext, libXcursor, libXxf86vm, libGL, libXi
-, unfree ? false
 , cmark
 }:
 
@@ -15,41 +14,34 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "aseprite";
-  version = if unfree then "1.2.40" else "1.1.7";
+  version = "1.2.40";
 
   src = fetchFromGitHub {
     owner = "aseprite";
     repo = "aseprite";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = if unfree
-      then "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo="
-      else "sha256-sRFuuY6cmVRE7myelGREMrzaQ09Olq74XP8uoS1NpD0=";
+    hash = "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo=";
   };
 
   nativeBuildInputs = [
-    cmake pkg-config
-  ] ++ lib.optionals unfree [ ninja ];
+    cmake pkg-config ninja
+  ];
 
   buildInputs = [
     curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib
     libX11 libXext libXcursor libXxf86vm
-  ] ++ lib.optionals unfree [
     cmark
     harfbuzzFull glib fontconfig pcre
     skia libGL libXi
   ];
 
-  patches = lib.optionals (!unfree) [
-    ./allegro-glibc-2.30.patch
-  ] ++ lib.optionals unfree [
+  patches = [
     ./shared-libwebp.patch
     ./shared-skia-deps.patch
   ];
 
-  postPatch = if (!unfree) then ''
-    sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-"
-  '' else ''
+  postPatch = ''
     sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-"
   '';
 
@@ -64,9 +56,6 @@ stdenv.mkDerivation rec {
     "-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"
     "-DUSE_SHARED_HARFBUZZ=ON"
     "-DUSE_SHARED_WEBP=ON"
@@ -99,7 +88,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://www.aseprite.org/";
     description = "Animated sprite editor & pixel art tool";
-    license = if unfree then licenses.unfree else licenses.gpl2;
+    license = licenses.unfree;
     longDescription =
       ''Aseprite is a program to create animated sprites. Its main features are:
 
@@ -113,8 +102,7 @@ stdenv.mkDerivation rec {
           - Multiple editors support.
           - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc.
           - Onion skinning.
-      '' + lib.optionalString unfree
-      ''
+
         This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/
         Consider supporting the developer: https://aseprite.org/#buy
       '';