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,7 +11,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
    homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
-    license = ["GPL" "LGPL"];
+    license = licenses.lgpl21Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ wkennington ];
  };