diff options
| author | Graham Christensen <graham@grahamc.com> | 2020-11-24 15:14:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 15:14:36 -0500 |
| commit | d9c3f13df33733943105a2613f4da31b537e5a83 (patch) | |
| tree | a3165f633aa7bee54819f541316af3b190c52936 /pkgs/applications/audio | |
| parent | 0be35abecdffc532173524de5a86984780088a07 (diff) | |
| parent | bc49a0815ae860010b4d593b02f00ab6f07d50ea (diff) | |
Merge pull request #104776 from grahamc/utillinux
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/clerk/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/strawberry/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/whipper/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 3c78295db674..912662b7726c 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, -utillinux, pythonPackages, libnotify }: +util-linux, pythonPackages, libnotify }: stdenv.mkDerivation { name = "clerk-2016-10-14"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = '' DESTDIR=$out PREFIX=/ make install wrapProgram $out/bin/clerk \ - --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 712a3e37a476..c2f1a0db701c 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -23,7 +23,7 @@ , libselinux ? null , libsepol ? null , p11-kit ? null -, utillinux ? null +, util-linux ? null , qtbase , qtx11extras , qttools @@ -67,7 +67,7 @@ mkDerivation rec { libselinux libsepol p11-kit - utillinux + util-linux ] ++ lib.optionals withGstreamer (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 5cbc9a07b6c7..3ff1368c9432 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac -, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }: +, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: python3.pkgs.buildPythonApplication rec { pname = "whipper"; @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]) + "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) ]; preBuild = '' |