From 00e720471bd459581fa99f6821ead597beafe05b Mon Sep 17 00:00:00 2001 From: Benjamin Cahill Date: Fri, 7 Jun 2013 20:50:41 -0500 Subject: [PATCH 1/2] Add pianobar, a command-line Pandora client --- pkgs/applications/audio/pianobar/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/audio/pianobar/default.nix diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix new file mode 100644 index 00000000000..222656b2f2b --- /dev/null +++ b/pkgs/applications/audio/pianobar/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, libao, faad2, libmad, readline, json_c, libgcrypt, gnutls }: + +stdenv.mkDerivation rec { + name = "pianobar-2013.05.19"; + + src = fetchurl { + url = "http://6xq.net/projects/pianobar/${name}.tar.bz2"; + sha256 = "cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046"; + }; + + buildInputs = [ + pkgconfig libao faad2 libmad json_c libgcrypt gnutls + ]; + + preBuild = " + makeFlags=\"PREFIX=$out\" + "; + + CC = "gcc"; + CFLAGS = "-std=c99"; + + meta = { + description = "A console front-end for Pandora.com"; + homepage = "http://6xq.net/projects/pianobar/"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89d265c99cf..3972fb08c8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7853,6 +7853,8 @@ let pdftk = callPackage ../tools/typesetting/pdftk { }; + pianobar = callPackage ../applications/audio/pianobar { }; + pianobooster = callPackage ../applications/audio/pianobooster { }; picard = callPackage ../applications/audio/picard { }; From 9350c1d5ceb58d1d9ac92d3672ef34cbfb140b2a Mon Sep 17 00:00:00 2001 From: Benjamin Cahill Date: Sat, 8 Jun 2013 14:13:36 -0500 Subject: [PATCH 2/2] pianobar: Change license and clean up code The license was set to unfree so that Hydra doesn't build it; this is for potential problems arising from the Pandora TOS. --- pkgs/applications/audio/pianobar/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 222656b2f2b..a9f4b02fa08 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -12,9 +12,7 @@ stdenv.mkDerivation rec { pkgconfig libao faad2 libmad json_c libgcrypt gnutls ]; - preBuild = " - makeFlags=\"PREFIX=$out\" - "; + makeFlags="PREFIX=$(out)"; CC = "gcc"; CFLAGS = "-std=c99"; @@ -23,5 +21,6 @@ stdenv.mkDerivation rec { description = "A console front-end for Pandora.com"; homepage = "http://6xq.net/projects/pianobar/"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.unfree; }; }