summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2022-11-18 14:49:26 -0300
committerGitHub <noreply@github.com>2022-11-18 14:49:26 -0300
commite38f6d37426a26bc8058681daee8a22679949e6f (patch)
tree066c2dcbd00af2dc671cfff1f13db653b03d722a
parent4c80e3665c019daaa91347fbcb4e5ae078cc39d3 (diff)
parentb2eb74c577e695a009d07dff4d5af8afc9c6e5c5 (diff)
downloadnixpkgs-e38f6d37426a26bc8058681daee8a22679949e6f.tar
nixpkgs-e38f6d37426a26bc8058681daee8a22679949e6f.tar.gz
nixpkgs-e38f6d37426a26bc8058681daee8a22679949e6f.tar.bz2
nixpkgs-e38f6d37426a26bc8058681daee8a22679949e6f.tar.lz
nixpkgs-e38f6d37426a26bc8058681daee8a22679949e6f.tar.xz
nixpkgs-e38f6d37426a26bc8058681daee8a22679949e6f.tar.zst
nixpkgs-e38f6d37426a26bc8058681daee8a22679949e6f.zip
Merge pull request #201652 from hmenke/sof-firmware
sof-firmware: 2.2 -> 2.2.2
-rw-r--r--pkgs/os-specific/linux/firmware/sof-firmware/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
index b15f4c4949d..24ab894c9f0 100644
--- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix
@@ -5,23 +5,26 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "sof-firmware";
-  version = "2.2";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "thesofproject";
     repo = "sof-bin";
     rev = "v${version}";
-    sha256 = "sha256-/gjGTDOXJ0vz/MH2hlistS3X3Euqf8T6TLnD1A2SBYo=";
+    sha256 = "sha256-ztewE/8Mc0bbKbxmbJ2sBn3TysuM9hoaSgqrboy77oI=";
   };
 
   dontFixup = true; # binaries must not be stripped or patchelfed
 
+  # There is no proper structure in the upstream repo.
+  # This needs to be adapted by hand for every new release.
   installPhase = ''
     runHook preInstall
-    cd "v${lib.versions.majorMinor version}.x"
-    mkdir -p $out/lib/firmware/intel/
-    cp -a sof-v${version} $out/lib/firmware/intel/sof
-    cp -a sof-tplg-v${version} $out/lib/firmware/intel/sof-tplg
+    cd "v2.2.x"
+    mkdir -p $out/lib/firmware/intel/sof{,-tplg}
+    cp -a sof-v2.2/* $out/lib/firmware/intel/sof
+    cp -a sof-v2.2.2/* $out/lib/firmware/intel/sof
+    cp -a sof-tplg-v2.2.1/* $out/lib/firmware/intel/sof-tplg
     runHook postInstall
   '';