From 8c8105d093860754d2c1ed276451dd8b4031ef05 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 8 Feb 2020 21:02:06 -0500
Subject: [PATCH] firmware: Add missing firmware for bluetooth

---
 firmware/default.nix | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/firmware/default.nix b/firmware/default.nix
index 38d10ce..932e243 100644
--- a/firmware/default.nix
+++ b/firmware/default.nix
@@ -1,26 +1,35 @@
 { stdenv
 , fetchFromGitLab
+, runCommandNoCC
 }:
 
-stdenv.mkDerivation {
-  pname = "pinebookpro-firmware";
-  version = "2019-12-04";
-
-  src = fetchFromGitLab {
+let
+  pinebook-firmware = fetchFromGitLab {
     domain = "gitlab.manjaro.org";
     owner = "tsys";
     repo = "pinebook-firmware";
     rev = "937f0d52d27d7712da6a008d35fd7c2819e2b077";
     sha256 = "0qldxxlxk6f3gymkljphwy7dz3cl1gxsnijhng2l7rkrh7h6wgi2";
   };
-
-  installPhase = ''
-    mkdir -p $out/lib/firmware/
-    cp -rv brcm $out/lib/firmware/brcm
-    cp -rv rockchip $out/lib/firmware/rockchip
-  '';
-
+  ap6256-firmware = fetchFromGitLab {
+    domain = "gitlab.manjaro.org";
+    owner = "manjaro-arm";
+    repo = "packages%2Fcommunity%2Fap6256-firmware";
+    rev = "a30bf312b268eab42d38fab0cc3ed3177895ff5d";
+    sha256 = "14gyb99j85xw07wrr9lilb1jz68y6r0n0b6x4ldl7d6igs988qwb";
+  };
+in
+runCommandNoCC "pinebookpro-firmware-2020-02-08" {
   meta = with stdenv.lib; {
     license = licenses.unfreeRedistributable;
   };
-}
+} ''
+  (PS4=" $ "; set -x
+  mkdir -p $out/lib/firmware/{brcm,rockchip}
+  (cd ${ap6256-firmware}
+  cp -fv *.hcd *blob *.bin *.txt $out/lib/firmware/brcm/
+  )
+  cp -fv ${pinebook-firmware}/brcm/* $out/lib/firmware/brcm/
+  cp -fv ${pinebook-firmware}/rockchip/* $out/lib/firmware/rockchip/
+  )
+''