mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
qt5, plasma-5: Make 'bin' output the first one
Stay consistent with other multiple output packages.
This commit is contained in:
parent
2fd11b762f
commit
fd29f6685f
@ -15,6 +15,6 @@ mkDerivation {
|
|||||||
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
|
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
|
||||||
qtx11extras
|
qtx11extras
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
|
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,6 @@ mkDerivation {
|
|||||||
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
|
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
|
||||||
plasma-framework plasma-workspace qtx11extras
|
plasma-framework plasma-workspace qtx11extras
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
enableParallelBuilding = false;
|
enableParallelBuilding = false;
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@ mkDerivation {
|
|||||||
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
|
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
|
||||||
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
|
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
||||||
NIX_CFLAGS_COMPILE = [
|
NIX_CFLAGS_COMPILE = [
|
||||||
''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
|
''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
|
||||||
|
@ -17,5 +17,5 @@ mkDerivation {
|
|||||||
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
|
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
|
||||||
qtwebkit
|
qtwebkit
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
}
|
}
|
||||||
|
@ -14,5 +14,5 @@ mkDerivation {
|
|||||||
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
|
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
|
||||||
qtx11extras
|
qtx11extras
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ mkDerivation {
|
|||||||
|
|
||||||
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
|
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage"
|
"-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage"
|
||||||
|
@ -13,5 +13,5 @@ mkDerivation {
|
|||||||
kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
|
kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
|
||||||
kactivities kactivities-stats kirigami2
|
kactivities kactivities-stats kirigami2
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,7 @@ let
|
|||||||
inherit (args) name;
|
inherit (args) name;
|
||||||
inherit (srcs."${name}") src version;
|
inherit (srcs."${name}") src version;
|
||||||
|
|
||||||
outputs = args.outputs or [ "out" "dev" "bin" ];
|
outputs = args.outputs or [ "bin" "dev" "out" ];
|
||||||
hasBin = lib.elem "bin" outputs;
|
hasBin = lib.elem "bin" outputs;
|
||||||
hasDev = lib.elem "dev" outputs;
|
hasDev = lib.elem "dev" outputs;
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
passthru.swig = swig2;
|
passthru.swig = swig2;
|
||||||
|
|
||||||
outputs = ["out" "dev" "bin" "py"];
|
outputs = ["bin" "dev" "out" "py"];
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
moveToOutput "lib/${python.libPrefix}" "$py"
|
moveToOutput "lib/${python.libPrefix}" "$py"
|
||||||
|
@ -76,7 +76,7 @@ stdenv.mkDerivation {
|
|||||||
[ bison flex gperf lndir perl pkgconfig python2 which ]
|
[ bison flex gperf lndir perl pkgconfig python2 which ]
|
||||||
++ lib.optional (!stdenv.isDarwin) patchelf;
|
++ lib.optional (!stdenv.isDarwin) patchelf;
|
||||||
|
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
copyPathsToStore (lib.readPathsFromFile ./. ./series)
|
copyPathsToStore (lib.readPathsFromFile ./. ./series)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtcharts";
|
name = "qtcharts";
|
||||||
qtInputs = [ qtbase qtdeclarative ];
|
qtInputs = [ qtbase qtdeclarative ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
'';
|
'';
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtconnectivity";
|
name = "qtconnectivity";
|
||||||
qtInputs = [ qtbase qtdeclarative ];
|
qtInputs = [ qtbase qtdeclarative ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
'';
|
'';
|
||||||
|
@ -7,7 +7,7 @@ qtSubmodule {
|
|||||||
patches = copyPathsToStore (readPathsFromFile ./. ./series);
|
patches = copyPathsToStore (readPathsFromFile ./. ./series);
|
||||||
qtInputs = [ qtbase qtsvg qtxmlpatterns ];
|
qtInputs = [ qtbase qtsvg qtxmlpatterns ];
|
||||||
nativeBuildInputs = [ python2 ];
|
nativeBuildInputs = [ python2 ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
|
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtlocation";
|
name = "qtlocation";
|
||||||
qtInputs = [ qtbase qtmultimedia ];
|
qtInputs = [ qtbase qtmultimedia ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtPluginPrefix" "$bin"
|
moveToOutput "$qtPluginPrefix" "$bin"
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
|
@ -11,7 +11,7 @@ qtSubmodule {
|
|||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ gstreamer gst-plugins-base libpulseaudio]
|
buildInputs = [ gstreamer gst-plugins-base libpulseaudio]
|
||||||
++ optional (stdenv.isLinux) alsaLib;
|
++ optional (stdenv.isLinux) alsaLib;
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
qmakeFlags = [ "GST_VERSION=1.0" ];
|
qmakeFlags = [ "GST_VERSION=1.0" ];
|
||||||
NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
|
NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtquickcontrols2";
|
name = "qtquickcontrols2";
|
||||||
qtInputs = [ qtdeclarative ];
|
qtInputs = [ qtdeclarative ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
'';
|
'';
|
||||||
|
@ -5,7 +5,7 @@ with stdenv.lib;
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtsensors";
|
name = "qtsensors";
|
||||||
qtInputs = [ qtbase qtdeclarative ];
|
qtInputs = [ qtbase qtdeclarative ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtPluginPrefix" "$bin"
|
moveToOutput "$qtPluginPrefix" "$bin"
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtsvg";
|
name = "qtsvg";
|
||||||
qtInputs = [ qtbase ];
|
qtInputs = [ qtbase ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtPluginPrefix" "$bin"
|
moveToOutput "$qtPluginPrefix" "$bin"
|
||||||
'';
|
'';
|
||||||
|
@ -5,7 +5,7 @@ with stdenv.lib;
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qttools";
|
name = "qttools";
|
||||||
qtInputs = [ qtbase ];
|
qtInputs = [ qtbase ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
patches = copyPathsToStore (readPathsFromFile ./. ./series);
|
patches = copyPathsToStore (readPathsFromFile ./. ./series);
|
||||||
# qmake moves all binaries to $dev in preFixup
|
# qmake moves all binaries to $dev in preFixup
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
@ -5,7 +5,7 @@ qtSubmodule {
|
|||||||
qtInputs = [ qtbase qtquickcontrols ];
|
qtInputs = [ qtbase qtquickcontrols ];
|
||||||
buildInputs = [ wayland ];
|
buildInputs = [ wayland ];
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtPluginPrefix" "$bin"
|
moveToOutput "$qtPluginPrefix" "$bin"
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtwebchannel";
|
name = "qtwebchannel";
|
||||||
qtInputs = [ qtbase qtdeclarative ];
|
qtInputs = [ qtbase qtdeclarative ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
'';
|
'';
|
||||||
|
@ -25,7 +25,7 @@ qtSubmodule {
|
|||||||
bison coreutils flex git gperf ninja pkgconfig python2 which
|
bison coreutils flex git gperf ninja pkgconfig python2 which
|
||||||
];
|
];
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
qtSubmodule {
|
qtSubmodule {
|
||||||
name = "qtwebsockets";
|
name = "qtwebsockets";
|
||||||
qtInputs = [ qtbase qtdeclarative ];
|
qtInputs = [ qtbase qtdeclarative ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "bin" "dev" "out" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
moveToOutput "$qtQmlPrefix" "$bin"
|
moveToOutput "$qtQmlPrefix" "$bin"
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user