summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-01-17 09:55:32 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-01-17 09:55:32 +0100
commita0bf07827bbf031d90ecb03f4e7345576208214a (patch)
treed61d526b3d4cd15946428da59ae80fbd921dbf35 /pkgs/applications
parentedcda996377719342ab9e335af570afc65058d26 (diff)
downloadnixpkgs-a0bf07827bbf031d90ecb03f4e7345576208214a.tar
nixpkgs-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.gz
nixpkgs-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.bz2
nixpkgs-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.lz
nixpkgs-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.xz
nixpkgs-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.zst
nixpkgs-a0bf07827bbf031d90ecb03f4e7345576208214a.zip
mpc: also rename the attribute to libmpc
Attrnames and package names should be as close as possible to avoid confusion.
I took care not to confuse the two mpc things during the mass-replace,
so hopefully I suceeded (tarball still builds).
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/audio/cmus/default.nix4
-rw-r--r--pkgs/applications/audio/moc/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 7cabc98ebaa..fd252754d66 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, mpc, mp4v2, libcue, pulseaudio}:
+{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, pulseaudio}:
 
 stdenv.mkDerivation rec {
   name = "cmus-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = "./configure prefix=$out";
 
-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 libcue pulseaudio ];
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue pulseaudio ];
 
   meta = {
     description = "Small, fast and powerful console music player for Linux and *BSD";
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index ec9b1dd47ae..a87e74dc87c 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
-, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
+, libvorbis, libmpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
 , libtool
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
-    mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
+    libmpc libsndfile jack2 db libmodplug timidity libid3tag libtool
   ];
 
   meta = with stdenv.lib; {