merge #7299: gstreamer: Darwin fixes

Solved trivial merge conflicts.
2015-04-29 17:53:09 +02:00
parent 51b1297c8a 626a047b2d
commit 85aafda509
19 changed files with 122 additions and 54 deletions
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [ pkgconfig ];
-  
+
  propagatedBuildInputs = [ libraw1394 ];

  meta = with stdenv.lib; {
    homepage = http://www.linux1394.org;
-    license = "LGPL";
+    license = licenses.lgpl21Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ wkennington ];
  };