Merge pull request 'disable oxipng' (#316) from disable-oxipng into main

Reviewed-on: #316

art/emoji/caro/default.nix

@@ -4,7 +4,6 @@
   imagemagick,
   lib,
   callPackage,
-  oxipng,
   pngquant,
 }: let
   source = builtins.fromJSON (builtins.readFile ./source.json);
@@ -19,7 +18,6 @@ in
     };
     nativeBuildInputs = [
       imagemagick
-      oxipng
       pngquant
     ];
     buildPhase = ''

lib/crushpng.nix

@@ -1,6 +1,5 @@
 {
   stdenvNoCC,
-  oxipng,
   pngquant,
 }: {
   name,
@@ -10,7 +9,7 @@
 stdenvNoCC.mkDerivation {
   dontUnpack = true;
   inherit (args) name src maxsize;
-  nativeBuildInputs = [oxipng pngquant];
+  nativeBuildInputs = [pngquant];
   buildPhase = ''
     ${./crushpng.sh} $src $out $maxsize
   '';

lib/crushpng.sh

@@ -2,11 +2,10 @@
 
 set -ex
 
-oxipng -o 4 --strip safe -Z $1 --out $2
-[ "$(wc -c $2 | awk '{print $1}')" -le $3 ] && exit 0
+[ "$(wc -c $1 | awk '{print $1}')" -le $3 ] && exit 0
 
 for i in $(seq 100 -1 0); do
-  cat $1 | pngquant --quality 0-$i - | oxipng -o 4 --strip safe -Z - --out $2
+  cat $1 | pngquant --quality 0-$i - > $2
   [ "$(wc -c $2 | awk '{print $1}')" -le $3 ] && exit 0
 done
 

lib/mkPleromaEmoji.nix

@@ -1,7 +1,6 @@
 {
   stdenv,
   fetchurl,
-  oxipng,
   pngquant,
   lib,
   libarchive,
@@ -24,7 +23,6 @@ in
   stdenv.mkDerivation ({
       inherit name src;
       nativeBuildInputs = [
-        oxipng
         pngquant
         libarchive
       ];
@@ -41,7 +39,7 @@ in
         mkdir $out
         cp -r *.png $out
       '';
-      meta = with lib; {
+      meta = {
         inherit (manifestData) description homepage;
         license = fixLicense manifestData.license;
       };