diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
| commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
| tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /pkgs/applications/audio | |
| parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
| parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/caudec/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/audio/freewheeling/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/mopidy/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index d84ff702ce872..3488d8fb38fb1 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postFixup = '' for executable in $(cd $out/bin && ls); do wrapProgram $out/bin/$executable \ - --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}" done ''; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 1611975182bcf..6971a718de9fd 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis -, libsndfile, libogg +, libSM, libsndfile, libogg }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf - liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg + liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM ]; patches = [ ./am_path_sdl.patch ./xml.patch ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index af37d859c7f71..d7454741ed59b 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,13 +5,13 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "06f1y87dqc7p6kq5npmg3ki8x4iacyjzd7nq7188x20y2zglrjbm"; + sha256 = "15i17rj2bh2kda6d6rwcjhs2m3nfsrcyq3lj9vbgmacg0cdb22pp"; }; nativeBuildInputs = [ wrapGAppsHook ]; |