public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt54.qtbase: set licenses correctly

This commit is contained in:
Thomas Tuegel 2016-01-28 18:10:42 -06:00
parent 150238dc99
commit d282d0bfe7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/qt-5/5.4/default.nix
View File

@ -48,13 +48,7 @@ let
enableParallelBuilding = args.enableParallelBuilding or true; enableParallelBuilding = args.enableParallelBuilding or true;
meta = { meta = self.qtbase.meta // (args.meta or {});
homepage = http://www.qt.io;
description = "A cross-platform application framework for C++";
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
maintainers = with maintainers; [ bbenoist qknight ttuegel ];
platforms = platforms.linux;
} // (args.meta or {});
}); });
addPackages = self: with self; addPackages = self: with self;
@ -116,4 +110,6 @@ let
}; };
in makeScope pkgs.newScope addPackages self = makeScope pkgs.newScope addPackages;
in self

2
pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
View File

@ -234,7 +234,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
homepage = http://www.qt.io; homepage = http://www.qt.io;
description = "A cross-platform application framework for C++"; description = "A cross-platform application framework for C++";
license = "GPL/LGPL"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
maintainers = with maintainers; [ bbenoist qknight ttuegel ]; maintainers = with maintainers; [ bbenoist qknight ttuegel ];
platforms = platforms.linux; platforms = platforms.linux;
}; };