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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen
2018-04-03 02:22:54 +03:00
parent 4c46f13f15 00fc66dc7d
commit 747ebe3f66
263 changed files with 9700 additions and 7232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,8 @@ rec {
gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base; };
gst-libav = callPackage ./libav { inherit gst-plugins-base; };
gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };