Merge branch 'master' into unused5

2018-07-21 15:41:22 +01:00
parent cd6e2c9642 e85db6863a
commit 218298b30f
203 changed files with 1655 additions and 627 deletions
@@ -12,7 +12,7 @@
 assert gtkSupport -> gtk3 != null;

 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
  name = "gst-plugins-good-1.14.0";