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-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
View File

@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
description = "Gstreamer Non-Linear Multimedia Editing Plugins";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
}

1
pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
View File

@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg";
description = "GStreamer's plug-in using FFmpeg";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
}

1
pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
View File

@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
description = "Python bindings for GStreamer";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
}

1
pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
View File

@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
'';
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
}