Merge master into staging

2018-04-08 10:54:17 +02:00
parent f9e17ca3f6 62dc989963
commit 595a72589f
150 changed files with 2923 additions and 772 deletions
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    description = "C++ interface for GStreamer";
    homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html;
    license = licenses.lgpl21Plus;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
    maintainers = with maintainers; [ romildo ];
  };