diff options
author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
---|---|---|
committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/applications/audio | |
parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
download | nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/flacon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/pulseaudio-ctl/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index a16593d4d1b0..8f3facec09b1 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper -, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain +, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain , gtk3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/flacon \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ - --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools + --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools mp3gain lame wavpack vorbisgain ]}" ''; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6e1e576043d1..1ad57efda7a0 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeWrapper -, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }: +, bc, dbus, gawk, gnused, libnotify, pulseaudio }: let - path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ]; + path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; pname = "pulseaudio-ctl"; in stdenv.mkDerivation rec { |