diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/development/libraries/qmltermwidget/default.nix | |
parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) | |
download | nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.gz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.bz2 nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.lz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.xz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.zst nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.zip |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/development/libraries/qmltermwidget/default.nix')
-rw-r--r-- | pkgs/development/libraries/qmltermwidget/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 9c7659efcec..a1be2afcd6c 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "This project is a QML port of qtermwidget"; homepage = "https://github.com/Swordifish90/qmltermwidget"; - licenses = with stdenv.lib.licenses; [ gpl2 ]; + license = with stdenv.lib.licenses; [ gpl2 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; |