From 8b1717c266154123f7db7f12c017dc029c5f3f3e Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Sat, 14 Nov 2020 07:20:20 +0000
Subject: [PATCH] sof-firmware: 1.5.1 -> 1.6

https://github.com/thesofproject/sof/releases/tag/v1.6
---
 .../linux/firmware/sof-firmware/default.nix        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
index a9fc44e48cc8..684d638ce29f 100644
--- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
@@ -3,24 +3,22 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "sof-firmware";
-  version = "1.5.1";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "thesofproject";
     repo = "sof-bin";
-    rev = "ae61d2778b0a0f47461a52da0d1f191f651e0763";
-    sha256 = "0j6bpwz49skvdvian46valjw4anwlrnkq703n0snkbngmq78prba";
+    rev = "cbdec6963b2c2d58b0080955d3c11b96ff4c92f0";
+    sha256 = "0la2pw1zpv50cywiqcfb00cxqvjc73drxwjchyzi54l508817nxh";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
-    mkdir -p $out/lib/firmware/intel
+    mkdir -p $out/lib/firmware
 
-    sed -i 's/ROOT=.*$/ROOT=$out/g' go.sh
-    sed -i 's/VERSION=.*$/VERSION=v${version}/g' go.sh
-
-    ./go.sh
+    patchShebangs go.sh
+    ROOT=$out SOF_VERSION=v${version} ./go.sh
   '';
 
   meta = with stdenv.lib; {