diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-29 17:53:09 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-29 17:53:09 +0200 |
commit | 85aafda509b626e68595facba1aeb7da336ce537 (patch) | |
tree | a0a07baabc9df05c4fb811c004aaf51ab1bcbb1f /pkgs/development/libraries/libraw1394 | |
parent | 51b1297c8a3fdb9d1abdc98ebbc85e3679373c21 (diff) | |
parent | 626a047b2d1c7375e40adf7a1ebc57737566e514 (diff) |
merge #7299: gstreamer: Darwin fixes
Solved trivial merge conflicts.
Diffstat (limited to 'pkgs/development/libraries/libraw1394')
-rw-r--r-- | pkgs/development/libraries/libraw1394/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index c9850fa8b699..bd6cbc3682c6 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -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 ]; }; |