Author: egorochkin Date: Wed Nov 17 15:20:57 2010 New Revision: 24739 URL: https://svn.nixos.org/websvn/nix/?rev=24739&sc=1
Log: cmus: packaged. Patch by Paul van der Walt <[email protected]>. Modified: nixpkgs/trunk/pkgs/applications/audio/cmus/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/applications/audio/cmus/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/applications/audio/cmus/default.nix Wed Nov 17 15:03:12 2010 (r24738) +++ nixpkgs/trunk/pkgs/applications/audio/cmus/default.nix Wed Nov 17 15:20:57 2010 (r24739) @@ -1,20 +1,21 @@ { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, mpc, mp4v2 }: stdenv.mkDerivation rec { - name = "cmus-2.3.3"; + name = "cmus-${version}"; + version = "2.3.3"; configurePhase = "./configure prefix=$out"; buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; src = fetchurl { - url = mirror://sourceforge/cmus/cmus-v2.3.3.tar.bz2; - md5 = "220e875e4210a6b54882114ef7094a79"; + url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2"; + sha256 = "13hc5d7h2ayjwnip345hc59rpjj9fgrp1i5spjw3s14prdqr733v"; }; meta = { description = "cmus is a small, fast and powerful console music player for Linux and *BSD"; homepage = http://cmus.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Nov 17 15:03:12 2010 (r24738) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Nov 17 15:20:57 2010 (r24739) @@ -5248,8 +5248,6 @@ amarok = newScope pkgs.kde4 ../applications/audio/amarok { }; - cmus = callPackage ../applications/audio/cmus { }; - amsn = callPackage ../applications/networking/instant-messengers/amsn { libstdcpp = gcc33.gcc; }; @@ -5382,6 +5380,8 @@ inherit (gnome) esound; }; + cmus = callPackage ../applications/audio/cmus { }; + compiz = callPackage ../applications/window-managers/compiz/core.nix { }; compiz_ccsm = callPackage ../applications/window-managers/compiz/ccsm.nix { }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
