From fd29f6685f47d5b114156fec4493f5e40adf7e1a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 27 Sep 2017 03:00:23 +0300 Subject: qt5, plasma-5: Make 'bin' output the first one Stay consistent with other multiple output packages. --- pkgs/desktops/plasma-5/breeze-qt5.nix | 2 +- pkgs/desktops/plasma-5/khotkeys.nix | 2 +- pkgs/desktops/plasma-5/kwin/default.nix | 2 +- pkgs/desktops/plasma-5/libksysguard/default.nix | 2 +- pkgs/desktops/plasma-5/oxygen.nix | 2 +- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 2 +- pkgs/desktops/plasma-5/systemsettings.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/desktops/plasma-5') diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index c0e55dec76d5..1448bb40d78c 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -15,6 +15,6 @@ mkDerivation { kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index 77f1002c08aa..77763c5e203e 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -12,6 +12,6 @@ mkDerivation { kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui plasma-framework plasma-workspace qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; enableParallelBuilding = false; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 09708b654877..f31294e00d6f 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -28,7 +28,7 @@ mkDerivation { kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"'' diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 4e88cd3df0e7..0f9fe40d73c3 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -17,5 +17,5 @@ mkDerivation { kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras qtwebkit ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 97421191d905..1b1f34f17b53 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -14,5 +14,5 @@ mkDerivation { ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 6fc6ef6d9e19..0e98b095e893 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -33,7 +33,7 @@ mkDerivation { qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage" diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 954a8f9f45ba..4c449aa2703c 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -13,5 +13,5 @@ mkDerivation { kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 kactivities kactivities-stats kirigami2 ]; - outputs = [ "out" "dev" "bin" ]; + outputs = [ "bin" "dev" "out" ]; } -- cgit 1.4.1