From c7f8fe583f8f24092ef052ffeaf7c923dfd639d1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 5 Jan 2025 12:13:17 +0100 Subject: [PATCH 1/2] also-ucm-conf: replace hardcoded paths to `/bin/rm` and `/bin/mkdir` --- pkgs/by-name/al/alsa-ucm-conf/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 462f9d3eea16..6cefe06a8e4d 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -3,6 +3,8 @@ fetchurl, lib, stdenv, + coreutils, + kmod, }: stdenv.mkDerivation rec { @@ -19,6 +21,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + substituteInPlace ucm2/lib/card-init.conf \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" \ + --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir" + + files=( + "ucm2/HDA/HDA.conf" + "ucm2/codecs/rt715/init.conf" + "ucm2/codecs/rt715-sdca/init.conf" + "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf" + "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf" + ) + + for file in "''${files[@]}"; do + substituteInPlace "$file" \ + --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe' + done + mkdir -p $out/share/alsa cp -r ucm ucm2 $out/share/alsa From c18ebb2166459345caeaeeac3610fe5953f7b885 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 5 Jan 2025 12:20:20 +0100 Subject: [PATCH 2/2] alsa-ucm-conf: switch to `finalAttrs` pattern --- pkgs/by-name/al/alsa-ucm-conf/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 6cefe06a8e4d..9d727e8d21ab 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -7,12 +7,12 @@ kmod, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf"; version = "1.2.12"; src = fetchurl { - url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2"; + url = "mirror://alsa/lib/alsa-ucm-conf-${finalAttrs.version}.tar.bz2"; hash = "sha256-Fo58BUm3v4mRCS+iv7kDYx33edxMQ+6PQnf8t3LYwDU="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { url = "https://www.alsa-project.org/files/pub/lib/"; }; - meta = with lib; { + meta = { homepage = "https://www.alsa-project.org/"; description = "ALSA Use Case Manager configuration"; @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - license = licenses.bsd3; - maintainers = [ maintainers.roastiek ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.roastiek ]; + platforms = lib.platforms.linux; }; -} +})