diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
| commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
| tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/applications/video | |
| parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
| parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
| download | nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/quvi/library.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/video/quvi/scripts.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/video/xbmc/default.nix | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 0fdd78fe1068..3fa426d9f6f9 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 68b61fc453de..cdc53367d114 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 65a930a261c9..f7bddc50ef82 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xbmc.org/; description = "Media center"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.iElectric maintainers.titanous ]; }; |