Merge branch 'master' into staging-next

2019-12-30 05:22:23 +01:00
parent fb66525297 e1ee43f514
commit 480fc1856a
97 changed files with 971 additions and 402 deletions
@@ -19,9 +19,7 @@ in
      patchShebangs ./tools
    '';

-    preConfigure = ''
-      configureFlags="$configureFlags --with-udevdir=$out/lib/udev"
-    '';
+    configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ];

    meta = with stdenv.lib; {
      description = "A repository of data files describing media player capabilities";