mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-18 02:44:30 +00:00
qt54.qtbase: set licenses correctly
This commit is contained in:
parent
150238dc99
commit
d282d0bfe7
@ -48,13 +48,7 @@ let
|
||||
|
||||
enableParallelBuilding = args.enableParallelBuilding or true;
|
||||
|
||||
meta = {
|
||||
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 {});
|
||||
meta = self.qtbase.meta // (args.meta or {});
|
||||
});
|
||||
|
||||
addPackages = self: with self;
|
||||
@ -116,4 +110,6 @@ let
|
||||
|
||||
};
|
||||
|
||||
in makeScope pkgs.newScope addPackages
|
||||
self = makeScope pkgs.newScope addPackages;
|
||||
|
||||
in self
|
||||
|
@ -234,7 +234,7 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = http://www.qt.io;
|
||||
description = "A cross-platform application framework for C++";
|
||||
license = "GPL/LGPL";
|
||||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ bbenoist qknight ttuegel ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user