diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-18 20:08:10 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:43 -0500 |
| commit | d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6 (patch) | |
| tree | 9630836d6fc10c9cbb1cd8aaa9a67a419c82767b | |
| parent | 6fa41788be7e020b5e551f7b89601cad2c277b12 (diff) | |
| download | nixpkgs-d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6.tar nixpkgs-d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6.tar.gz nixpkgs-d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6.tar.bz2 nixpkgs-d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6.tar.lz nixpkgs-d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6.tar.xz nixpkgs-d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6.tar.zst nixpkgs-d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6.zip | |
qt5: use one output by default
| -rw-r--r-- | pkgs/applications/kde/build-support/application.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.6/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/default.nix | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix index a5d1ccc3add..892d82fb51e 100644 --- a/pkgs/applications/kde/build-support/application.nix +++ b/pkgs/applications/kde/build-support/application.nix @@ -11,6 +11,8 @@ mkDerivation (args // { name = "${name}-${version}"; inherit src; + outputs = args.outputs or [ "out" "dev" ]; + meta = { platforms = lib.platforms.linux; homepage = "http://www.kde.org"; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index b286f8c5298..b250ae8b952 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -48,8 +48,6 @@ let mkDerivation = args: stdenv.mkDerivation (args // { - outputs = args.outputs or [ "out" "dev" ]; - qmakeFlags = (args.qmakeFlags or []) ++ optional (debug != null) @@ -82,6 +80,7 @@ let NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; + outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; setupHook = ../qtsubmodule-setup-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix index 034c7fd10e1..fd4769a02c6 100644 --- a/pkgs/development/libraries/qt-5/5.8/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/default.nix @@ -39,8 +39,6 @@ let mkDerivation = args: stdenv.mkDerivation (args // { - outputs = args.outputs or [ "out" "dev" ]; - qmakeFlags = (args.qmakeFlags or []) ++ optional (debug != null) @@ -73,6 +71,7 @@ let NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; + outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; setupHook = ../qtsubmodule-setup-hook.sh; |