about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-06-15 22:51:21 +0100
committerGitHub <noreply@github.com>2020-06-15 22:51:21 +0100
commit85baf7179fdd384f5d618c2db131fa7cb62ce13b (patch)
treea87dda8d90fd3da48219399fa5df6f9f6981d43c /pkgs/os-specific
parente1e3911536105cc6bf6f72e414dbb4025c9d2c6d (diff)
parent0b1eb52866ece933d461867b3cca72554403b9ba (diff)
downloadnixlib-85baf7179fdd384f5d618c2db131fa7cb62ce13b.tar
nixlib-85baf7179fdd384f5d618c2db131fa7cb62ce13b.tar.gz
nixlib-85baf7179fdd384f5d618c2db131fa7cb62ce13b.tar.bz2
nixlib-85baf7179fdd384f5d618c2db131fa7cb62ce13b.tar.lz
nixlib-85baf7179fdd384f5d618c2db131fa7cb62ce13b.tar.xz
nixlib-85baf7179fdd384f5d618c2db131fa7cb62ce13b.tar.zst
nixlib-85baf7179fdd384f5d618c2db131fa7cb62ce13b.zip
Merge pull request #89957 from evenbrenden/sof-firmware-v1.5
sof-firmware: 1.4.2 -> 1.5.1
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/firmware/sof-firmware/default.nix23
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
index 73ab46b3c8a6..a9fc44e48cc8 100644
--- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
@@ -1,28 +1,33 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "sof-firmware";
-  version = "1.4.2";
+  version = "1.5.1";
 
-  src = fetchurl {
-    url = "https://www.alsa-project.org/files/pub/misc/sof/${pname}-${version}.tar.bz2";
-    sha256 = "1nkh020gjm45vxd6fvmz63hj16ilff2nl5avvsklajjs6xci1sf5";
+  src = fetchFromGitHub {
+    owner = "thesofproject";
+    repo = "sof-bin";
+    rev = "ae61d2778b0a0f47461a52da0d1f191f651e0763";
+    sha256 = "0j6bpwz49skvdvian46valjw4anwlrnkq703n0snkbngmq78prba";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
-    rm lib/firmware/intel/{sof/LICENCE,sof-tplg/LICENCE}
-    mkdir $out
-    cp -r lib $out/lib
+    mkdir -p $out/lib/firmware/intel
+
+    sed -i 's/ROOT=.*$/ROOT=$out/g' go.sh
+    sed -i 's/VERSION=.*$/VERSION=v${version}/g' go.sh
+
+    ./go.sh
   '';
 
   meta = with stdenv.lib; {
     description = "Sound Open Firmware";
     homepage = "https://www.sofproject.org/";
     license = with licenses; [ bsd3 isc ];
-    maintainers = with maintainers; [ lblasc ];
+    maintainers = with maintainers; [ lblasc evenbrenden ];
     platforms = with platforms; linux;
   };
 }