From d282d0bfe7cbcc81bd45f40e3785e9d135e040ee Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 28 Jan 2016 18:10:42 -0600 Subject: [PATCH] qt54.qtbase: set licenses correctly --- pkgs/development/libraries/qt-5/5.4/default.nix | 12 ++++-------- .../libraries/qt-5/5.4/qtbase/default.nix | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index 3262da124cd..ab132ae21c8 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -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 diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix index 15f77c8fc87..9525678ca1a 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix @@ -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; };