From fd29f6685f47d5b114156fec4493f5e40adf7e1a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Sep 2017 03:00:23 +0300
Subject: [PATCH] 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 +-
 pkgs/development/libraries/kde-frameworks/default.nix         | 2 +-
 pkgs/development/libraries/libplist/default.nix               | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtbase/default.nix        | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtcharts.nix              | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix        | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtlocation.nix            | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix          | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix      | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtsensors.nix             | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtsvg.nix                 | 2 +-
 pkgs/development/libraries/qt-5/5.9/qttools/default.nix       | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtwayland.nix             | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix          | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix   | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

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" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index de99503131c1..2bf10737ab0b 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -78,7 +78,7 @@ let
             inherit (args) name;
             inherit (srcs."${name}") src version;
 
-            outputs = args.outputs or [ "out" "dev" "bin" ];
+            outputs = args.outputs or [ "bin" "dev" "out" ];
             hasBin = lib.elem "bin" outputs;
             hasDev = lib.elem "dev" outputs;
 
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 98853d08cfe6..d8ebc2e83a61 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
 
   passthru.swig = swig2;
 
-  outputs = ["out" "dev" "bin" "py"];
+  outputs = ["bin" "dev" "out" "py"];
 
   postFixup = ''
     moveToOutput "lib/${python.libPrefix}" "$py"
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
index b7f9b3eb42e8..d63936c561c1 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     [ bison flex gperf lndir perl pkgconfig python2 which ]
     ++ lib.optional (!stdenv.isDarwin) patchelf;
 
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
diff --git a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
index 58e197d504f9..afc09e3eeb58 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
@@ -3,7 +3,7 @@
 qtSubmodule {
   name = "qtcharts";
   qtInputs = [ qtbase qtdeclarative ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtQmlPrefix" "$bin"
   '';
diff --git a/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix
index 1c10535c7853..8153f0d40785 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix
@@ -3,7 +3,7 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtQmlPrefix" "$bin"
   '';
diff --git a/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix
index cc6653348859..39b4d35ef36c 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix
@@ -7,7 +7,7 @@ qtSubmodule {
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python2 ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
 
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
diff --git a/pkgs/development/libraries/qt-5/5.9/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
index 6270bc577cf0..f883fd4ff40f 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
@@ -3,7 +3,7 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtPluginPrefix" "$bin"
     moveToOutput "$qtQmlPrefix" "$bin"
diff --git a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix
index 4fe9c90232a2..1c728b036ad8 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix
@@ -11,7 +11,7 @@ qtSubmodule {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gstreamer gst-plugins-base libpulseaudio]
     ++ optional (stdenv.isLinux) alsaLib;
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   qmakeFlags = [ "GST_VERSION=1.0" ];
   NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
   postInstall = ''
diff --git a/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix
index 1a52d1802cee..37d7d59f8153 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix
@@ -3,7 +3,7 @@
 qtSubmodule {
   name = "qtquickcontrols2";
   qtInputs = [ qtdeclarative ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtQmlPrefix" "$bin"
   '';
diff --git a/pkgs/development/libraries/qt-5/5.9/qtsensors.nix b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix
index 75829d3f0aaf..4127d00b7693 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtPluginPrefix" "$bin"
     moveToOutput "$qtQmlPrefix" "$bin"
diff --git a/pkgs/development/libraries/qt-5/5.9/qtsvg.nix b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix
index 0e21cf89340a..ce419731dfaf 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix
@@ -3,7 +3,7 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtPluginPrefix" "$bin"
   '';
diff --git a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix
index 012e8bca75d3..38d8f1ebe647 100644
--- a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   # qmake moves all binaries to $dev in preFixup
   postFixup = ''
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwayland.nix b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix
index 3e5deea7ec16..8b3072c5534d 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwayland.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix
@@ -5,7 +5,7 @@ qtSubmodule {
   qtInputs = [ qtbase qtquickcontrols ];
   buildInputs = [ wayland ];
   nativeBuildInputs = [ pkgconfig ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtPluginPrefix" "$bin"
     moveToOutput "$qtQmlPrefix" "$bin"
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix
index 50a539dbe729..e6a2d74e714c 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix
@@ -3,7 +3,7 @@
 qtSubmodule {
   name = "qtwebchannel";
   qtInputs = [ qtbase qtdeclarative ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtQmlPrefix" "$bin"
   '';
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
index c0b9aa83e194..58716f65738f 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
@@ -25,7 +25,7 @@ qtSubmodule {
     bison coreutils flex git gperf ninja pkgconfig python2 which
   ];
   doCheck = true;
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix
index 925adce75a92..888c1fb65348 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix
@@ -3,7 +3,7 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "dev" "out" ];
   postInstall = ''
     moveToOutput "$qtQmlPrefix" "$bin"
   '';