diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-12 17:20:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-12 15:20:14 +0000 |
commit | 272e4273f0cd60e0b92019b09a78a8626b383e12 (patch) | |
tree | 51fddb8281efa06f9fcf04631fb71047fe48042d | |
parent | 8d25f838d04c84ddec97c75f9cb6f7dbc21e5468 (diff) | |
download | nixpkgs-272e4273f0cd60e0b92019b09a78a8626b383e12.tar nixpkgs-272e4273f0cd60e0b92019b09a78a8626b383e12.tar.gz nixpkgs-272e4273f0cd60e0b92019b09a78a8626b383e12.tar.bz2 nixpkgs-272e4273f0cd60e0b92019b09a78a8626b383e12.tar.lz nixpkgs-272e4273f0cd60e0b92019b09a78a8626b383e12.tar.xz nixpkgs-272e4273f0cd60e0b92019b09a78a8626b383e12.tar.zst nixpkgs-272e4273f0cd60e0b92019b09a78a8626b383e12.zip |
alsa-utils: do not sed info script (#97841)
The script contains lspci.log file names and the overeager replacement breaks it.
-rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 13 |
1 files 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 470536db4b7..91d7e05a882 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"; |