From a6c9a6f5bff3835ceb1d201e7904c83c9736f15d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 24 Jan 2016 11:08:43 -0600 Subject: [PATCH] qt55.qtbase: set licenses correctly --- pkgs/development/libraries/qt-5/5.5/default.nix | 12 ++++-------- .../libraries/qt-5/5.5/qtbase/default.nix | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 5f631357b5b..ae98c2c4b1f 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/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; @@ -117,4 +111,6 @@ let }; -in makeScope pkgs.newScope addPackages + self = makeScope pkgs.newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 092f72264c3..5b0ced23028 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -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; };