From b4ff81ffd629d3f699b880ad62eaabf364a32d1d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 22 Apr 2016 08:11:10 -0500 Subject: phonon-backend-vlc: init at 0.9.0 --- pkgs/applications/audio/tomahawk/default.nix | 4 ++-- pkgs/applications/graphics/digikam/default.nix | 6 +++--- pkgs/applications/video/minitube/default.nix | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 61cb6b9896e3..7021cd165cfd 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4 +, liblastfm, lucenepp, phonon, phonon-backend-vlc, qca2, qjson, qt4 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ - "${phonon_backend_vlc}/lib/kde4/plugins" + "${phonon-backend-vlc}/lib/kde4/plugins" ]; in '' for i in "$out"/bin/*; do diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 119125066bda..453dc0809956 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -19,7 +19,7 @@ # Supplementary packages required only by the wrapper. , bash, kde_runtime, kde_baseapps, makeWrapper, oxygen_icons -, phonon_backend_vlc /*phonon_backend_gstreamer,*/ +, phonon-backend-vlc /*phonon-backend-gstreamer,*/ , ffmpegthumbs /*mplayerthumbs*/ , runCommand, shared_mime_info, writeScriptBin }: @@ -93,7 +93,7 @@ let kdePkgs = [ build # digikam's own build kdelibs kdepimlibs kde_runtime kde_baseapps libkdcraw oxygen_icons - /*phonon_backend_gstreamer*/ phonon_backend_vlc + /*phonon-backend-gstreamer*/ phonon-backend-vlc ffmpegthumbs /*mplayerthumbs*/ shared_mime_info ] # Optional build time dependencies ++ [ @@ -208,7 +208,7 @@ TODO - Per lib `KDELIBS` environment variable export. See above in-code TODO comment. - Missing optional `qt_soap` or `herqq` (av + normal package) dependencies. Those are not yet (or not fully) packaged in nix. Mainly required for upnp export. - - Possibility to use the `phonon_backend_gstreamer` with its own user specified set of backend. + - Possibility to use the `phonon-backend-gstreamer` with its own user specified set of backend. - Allow user to disable optional features or dependencies reacting properly. - Compile `kipiplugins` as a separate package (so that it can be used by other kde packages and so that this package's build time is reduced). diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 1a621032125b..971588901b46 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4, qmake4Hook +{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook # "Free" API key generated by nckx , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "flaviotordini"; }; - buildInputs = [ phonon phonon_backend_vlc qt4 ]; + buildInputs = [ phonon phonon-backend-vlc qt4 ]; nativeBuildInputs = [ makeWrapper qmake4Hook ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/minitube \ - --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins" + --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins" ''; meta = with stdenv.lib; { -- cgit 1.4.1