From 272e4273f0cd60e0b92019b09a78a8626b383e12 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 17:20:14 +0200 Subject: [PATCH] alsa-utils: do not sed info script (#97841) The script contains lspci.log file names and the overeager replacement breaks it. --- pkgs/os-specific/linux/alsa-utils/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 470536db4b7b81..91d7e05a882cad 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}: +{stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: stdenv.mkDerivation rec { pname = "alsa-utils"; @@ -9,18 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz"; }; - patchPhase = '' - substituteInPlace alsa-info/alsa-info.sh \ - --replace "which" "type -p" \ - --replace "lspci" "${pciutils}/bin/lspci" - ''; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext makeWrapper ]; buildInputs = [ alsaLib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; + postFixup = '' + wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}" + ''; + meta = with stdenv.lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture utils";