Merge branch 'master' into staging-next

Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
parent 7a22083e12 93147d737d
commit cbabebcc2e
263 changed files with 5922 additions and 4627 deletions
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
  configureFlags = [ "-v" ];

  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ ];
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ enzime ];
    license = stdenv.lib.licenses.lgpl3;
    description = "An opensource database of photographic lenses and their characteristics";
    homepage = http://lensfun.sourceforge.net/;