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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/gstreamer/default.nix
View File

@@ -1,4 +1,4 @@
{ callPackage }:
{ callPackage, libva-full }:
rec {
gstreamer = callPackage ./core { };
@@ -21,7 +21,10 @@ rec {
# (Non Linear Engine).
gst-editing-services = callPackage ./ges { inherit gnonlin; };
gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; };
gst-vaapi = callPackage ./vaapi {
inherit gst-plugins-base gstreamer gst-plugins-bad;
libva = libva-full; # looks also for libva-{x11,wayland}
};
gst-validate = callPackage ./validate { inherit gst-plugins-base; };
}

7
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2, libsoup, libshout, libintlOrEmpty
, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty
, # Whether to build no plugins that have external dependencies
# (except the PulseAudio plugin).
minimalDeps ? false
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \
--replace "${ncurses.dev}/lib" "${ncurses.out}/lib"
'';
meta = {
homepage = http://gstreamer.freedesktop.org;

8
pkgs/development/libraries/gstreamer/vaapi/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva
{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland
, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
, libvpx
}:
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev
xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx ];
buildInputs = [
gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev
xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx
];
preConfigure = "
export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0