cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qt55.qtbase: set licenses correctly

Browse source
This commit is contained in:
Thomas Tuegel 2016-01-24 11:08:43 -06:00
parent 9adcd6f78c
commit a6c9a6f5bf
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.5/default.nix
View file

@ -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;
@ -117,4 +111,6 @@ let
};
in makeScope pkgs.newScope addPackages
self = makeScope pkgs.newScope addPackages;
in self

2
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View file

@ -243,7 +243,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;
};