From d5e0e78eb09505821d1295d6467d893e6531d501 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 30 Jan 2023 07:21:35 +0000
Subject: [PATCH] handbrake: fix on aarch64  (but this causes a LOT of
 rebuilding, so let's rather wait for upstream instead

---
 flake.lock           |  6 +++---
 modules/packages.nix |  4 +---
 nixpatches/list.nix  | 12 +++++++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 90ccbfe4..028446b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,12 +39,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=",
-        "path": "/nix/store/rk489311m97gs49qid05c1xra05h64sm-source/nixpatches",
+        "narHash": "sha256-Qn/NV3Yjg1B/N9Wn8FqJLuFdfqeKksh3YDDW40E5XXU=",
+        "path": "/nix/store/696zspgnrdzrpb4396f1gqqh6jjcc18s-source/nixpatches",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/rk489311m97gs49qid05c1xra05h64sm-source/nixpatches",
+        "path": "/nix/store/696zspgnrdzrpb4396f1gqqh6jjcc18s-source/nixpatches",
         "type": "path"
       }
     },
diff --git a/modules/packages.nix b/modules/packages.nix
index 427c819e..747103ca 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -107,6 +107,7 @@ let
     { pkg = gpodder-configured; dir = [ "gPodder" ]; }
 
     gthumb
+    handbrake
     inkscape
 
     kdenlive
@@ -173,9 +174,6 @@ let
     # gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
     # gpt2tc  # XXX: unreliable mirror
 
-    # TODO(unpin): handbrake is broken on aarch64-linux 2023/01/29
-    handbrake
-
     logseq
     losslesscut-bin
     makemkv
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index c45b300b..7287dc34 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -22,10 +22,16 @@
 
   # fix handbrake build by: handbrake: 1.5.1 -> 1.6.1
   # PR opened 2023/01/23
+  # (fetchpatch {
+  #   url = "https://github.com/NixOS/nixpkgs/pull/212306.diff";
+  #   hash = "sha256-iQX2NaZaCzZVRlCM0pgXt0gecNwhXGeh3kXEiY38ZIM=";
+  # })
+
+  # fix handbrake build by: ffmpeg: merge with ffmpeg-full
+  # PR merged 2023/01/27
   (fetchpatch {
-    # see alternate fix: <https://github.com/NixOS/nixpkgs/pull/211834>
-    url = "https://github.com/NixOS/nixpkgs/pull/212306.diff";
-    hash = "sha256-iQX2NaZaCzZVRlCM0pgXt0gecNwhXGeh3kXEiY38ZIM=";
+    url = "https://github.com/NixOS/nixpkgs/pull/211834.diff";
+    hash = "sha256-8/S9Sh7Y7ku+9+C2QsYbo24usL2KXGYPWyUrI0Xa5TE=";
   })
 
   ./2022-12-19-i2p-aarch64.patch