public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: use one output by default

Browse Source
This commit is contained in:
Thomas Tuegel 2017-05-18 20:08:10 -05:00
parent 6fa41788be
commit d9f29afa64
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde/build-support/application.nix
View File

@ -11,6 +11,8 @@ mkDerivation (args // {
name = "${name}-${version}"; name = "${name}-${version}";
inherit src; inherit src;
outputs = args.outputs or [ "out" "dev" ];
meta = { meta = {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
homepage = "http://www.kde.org"; homepage = "http://www.kde.org";

3
pkgs/development/libraries/qt-5/5.6/default.nix
View File

@ -48,8 +48,6 @@ let
mkDerivation = args: mkDerivation = args:
stdenv.mkDerivation (args // { stdenv.mkDerivation (args // {
outputs = args.outputs or [ "out" "dev" ];
qmakeFlags = qmakeFlags =
(args.qmakeFlags or []) (args.qmakeFlags or [])
++ optional (debug != null) ++ optional (debug != null)
@ -82,6 +80,7 @@ let
NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false; setOutputFlags = args.setOutputFlags or false;
setupHook = ../qtsubmodule-setup-hook.sh; setupHook = ../qtsubmodule-setup-hook.sh;

3
pkgs/development/libraries/qt-5/5.8/default.nix
View File

@ -39,8 +39,6 @@ let
mkDerivation = args: mkDerivation = args:
stdenv.mkDerivation (args // { stdenv.mkDerivation (args // {
outputs = args.outputs or [ "out" "dev" ];
qmakeFlags = qmakeFlags =
(args.qmakeFlags or []) (args.qmakeFlags or [])
++ optional (debug != null) ++ optional (debug != null)
@ -73,6 +71,7 @@ let
NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false; setOutputFlags = args.setOutputFlags or false;
setupHook = ../qtsubmodule-setup-hook.sh; setupHook = ../qtsubmodule-setup-hook.sh;