public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging

Browse Source
This commit is contained in:
Nikolay Amiantov
2016-04-25 18:02:10 +03:00
parent 48195dd2be f9e5eccb13
commit 09f02b918e
303 changed files with 6249 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/video/dvd-slideshow/default.nix
View File

@@ -1,10 +1,12 @@
{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
let
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
wrapper = writeScript "dvd-slideshow.sh" ''
#!/bin/bash
# wrapper script for dvd-slideshow programs
export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg.bin}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH
export PATH=${binPath}:$PATH
dir=`dirname "$0"`
exe=`basename "$0"`

8
pkgs/applications/video/kodi/default.nix
View File

@@ -40,16 +40,16 @@ assert rtmpSupport -> rtmpdump != null;
let
rel = "Jarvis";
ffmpeg_2_8_6 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.0.tar.gz";
sha256 = "00cvjwfpz6ladmln4yny4d4viwflrbgrid1na412g5pif70qv3dh";
url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.1.tar.gz";
sha256 = "1qp8b97298l2pnhhcp7xczdfwr7q7ibxlk4vp8pfmxli2h272wan";
};
in stdenv.mkDerivation rec {
name = "kodi-" + version;
version = "16.0";
version = "16.1";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
sha256 = "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884";
sha256 = "047xpmz78k3d6nhk1x9s8z0bw1b1w9kca46zxkg86p3iyapwi0kx";
};
buildInputs = [