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

qt5, plasma-5: Make 'bin' output the first one

Browse Source 
Stay consistent with other multiple output packages.
This commit is contained in:
Tuomas Tynkkynen
2017-10-24 23:48:49 +03:00
committed by Tuomas Tynkkynen
parent 2fd11b762f
commit fd29f6685f
23 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
+1 -1
View File
@@ -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)
pkgs/development/libraries/qt-5/5.9/qtcharts.nix
+1 -1
View File
@@ -3,7 +3,7 @@
qtSubmodule {
name = "qtcharts";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';
pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix
+1 -1
View File
@@ -3,7 +3,7 @@
qtSubmodule {
name = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';
pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix
+1 -1
View File
@@ -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\""
pkgs/development/libraries/qt-5/5.9/qtlocation.nix
+1 -1
View File
@@ -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"
pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix
+1 -1
View File
@@ -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 = ''
pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix
+1 -1
View File
@@ -3,7 +3,7 @@
qtSubmodule {
name = "qtquickcontrols2";
qtInputs = [ qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';
pkgs/development/libraries/qt-5/5.9/qtsensors.nix
+1 -1
View File
@@ -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"
pkgs/development/libraries/qt-5/5.9/qtsvg.nix
+1 -1
View File
@@ -3,7 +3,7 @@
qtSubmodule {
name = "qtsvg";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtPluginPrefix" "$bin"
'';
pkgs/development/libraries/qt-5/5.9/qttools/default.nix
+1 -1
View File
@@ -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 = ''
pkgs/development/libraries/qt-5/5.9/qtwayland.nix
+1 -1
View File
@@ -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"
pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix
+1 -1
View File
@@ -3,7 +3,7 @@
qtSubmodule {
name = "qtwebchannel";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';
pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
+1 -1
View File
@@ -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;
pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix
+1 -1
View File
@@ -3,7 +3,7 @@
qtSubmodule {
name = "qtwebsockets";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';