From 738596fb32b4d7252bdc4d0e3253bcb4574ae8fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Thu, 1 Dec 2022 20:39:15 +0100
Subject: [PATCH] Add JXL support to akkoma

---
 config/services/akkoma/default.nix |  4 +++-
 flake.lock                         | 23 ++++++++++++++++++++---
 flake.nix                          |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/config/services/akkoma/default.nix b/config/services/akkoma/default.nix
index 2962e8a5..70a1854c 100644
--- a/config/services/akkoma/default.nix
+++ b/config/services/akkoma/default.nix
@@ -3,6 +3,8 @@
   nix-packages,
   config,
   lib,
+  nixpkgs-libjxl-update,
+  system,
   ...
 }: let
   emoji_set_names = ["volpeon-blobfox-flip" "volpeon-blobfox" "volpeon-bunhd-flip" "volpeon-bunhd" "volpeon-drgn" "volpeon-fox" "volpeon-raccoon" "volpeon-vlpn" "lotte" "caro"];
@@ -203,7 +205,7 @@ in {
     group = "akkoma";
     secretConfigFile = config.sops.secrets."services/akkoma.exs".path;
   };
-  systemd.services.pleroma.path = with pkgs; [exiftool imagemagick ffmpeg];
+  systemd.services.pleroma.path = with pkgs; [exiftool nixpkgs-libjxl-update.legacyPackages.${system}.imagemagick ffmpeg];
   services.postgresql.ensureDatabases = ["akkoma"];
   services.postgresql.ensureUsers = [
     {
diff --git a/flake.lock b/flake.lock
index 5707ee2d..e4cd66d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -577,11 +577,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1669708371,
-        "narHash": "sha256-cWSNnbs8aA6L7ITx5z/czm1TTCayThUDsYrn9Ld8/6M=",
+        "lastModified": 1669923178,
+        "narHash": "sha256-wNZ0JuH3Cqnzz5P45sLeGn/Pgb+cAR5PtOwGf5xIo6o=",
         "owner": "DarkKirb",
         "repo": "nix-packages",
-        "rev": "202c40926e3ecfe894caa817c723afafec3f06d0",
+        "rev": "a38f86d6344b42c4a78ea304342980ff1e6f174b",
         "type": "github"
       },
       "original": {
@@ -670,6 +670,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-libjxl-update": {
+      "locked": {
+        "lastModified": 1669918756,
+        "narHash": "sha256-vc0TNEnwsIHVoQ9i7G0Sic80sQrrig6vxW375O5vNDM=",
+        "owner": "darkkirb",
+        "repo": "nixpkgs",
+        "rev": "9c686f3242fc3dde1819a92a7778ed58d088ec0b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "darkkirb",
+        "ref": "bump-jxl-0.7.0",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-noto-variable": {
       "locked": {
         "lastModified": 1648877644,
@@ -855,6 +871,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-fluffychat": "nixpkgs-fluffychat",
+        "nixpkgs-libjxl-update": "nixpkgs-libjxl-update",
         "nixpkgs-noto-variable": "nixpkgs-noto-variable",
         "nur": "nur",
         "plasma-manager": "plasma-manager",
diff --git a/flake.nix b/flake.nix
index c45fdf34..a5c0a72d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,7 @@ rec {
     plasma-manager.url = "github:pjones/plasma-manager";
     plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
     plasma-manager.inputs.home-manager.follows = "home-manager";
+    nixpkgs-libjxl-update.url = "github:darkkirb/nixpkgs/bump-jxl-0.7.0";
 
     nix-packages.url = "github:DarkKirb/nix-packages";
     nix-packages.inputs.nixpkgs.follows = "nixpkgs";
-- 
2.47.0