diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
commit | d5758c99a315faac7e0631ae4e7bd707095be3c1 (patch) | |
tree | 9177bc0c57faffe2d7fcbc562f43171f67c337eb /pkgs/applications/video/bangarang/default.nix | |
parent | 3aae4ccffa8bdaea0bcc136c39fdc33729e76af3 (diff) | |
parent | e710915ffc681b06a61ab2257e44c1cd8abbd0ef (diff) | |
download | nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.gz nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.bz2 nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.lz nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.xz nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.zst nixlib-d5758c99a315faac7e0631ae4e7bd707095be3c1.zip |
Merge remote-tracking branch 'origin/master' into x-updates
Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix
Diffstat (limited to 'pkgs/applications/video/bangarang/default.nix')
-rw-r--r-- | pkgs/applications/video/bangarang/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 2fe4b4d0bdc2..0bc7476dc820 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: stdenv.mkDerivation rec { - name = "bangarang-2.0"; + name = "bangarang-2.1"; src = fetchurl { url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz"; - sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz"; + sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ]; + buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; + buildNativeInputs = [ cmake ]; meta = with stdenv.lib; { description = "A media player for KDE based on Nepomuk and Phonon"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; homepage = http://bangarangkde.wordpress.com/; license = "GPLv3"; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; } |