qt-4: Use multiple outputs

This is a pretty modest use of multiple outputs - mainly to eliminate
-dev outputs from Qt's closure.
This commit is contained in:
Eelco Dolstra 2016-09-27 14:56:17 +02:00
parent c5ddb7dd56
commit a5ee4d2c78

View File

@ -36,6 +36,12 @@ stdenv.mkDerivation rec {
sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272";
}; };
outputs = [ "out" "dev" ];
outputInclude = "out";
setOutputFlags = false;
# The version property must be kept because it will be included into the QtSDK package name # The version property must be kept because it will be included into the QtSDK package name
version = vers; version = vers;
@ -87,8 +93,8 @@ stdenv.mkDerivation rec {
-docdir $out/share/doc/${name} -docdir $out/share/doc/${name}
-plugindir $out/lib/qt4/plugins -plugindir $out/lib/qt4/plugins
-importdir $out/lib/qt4/imports -importdir $out/lib/qt4/imports
-examplesdir $out/share/doc/${name}/examples -examplesdir $TMPDIR/share/doc/${name}/examples
-demosdir $out/share/doc/${name}/demos -demosdir $TMPDIR/share/doc/${name}/demos
-datadir $out/share/${name} -datadir $out/share/${name}
-translationdir $out/share/${name}/translations -translationdir $out/share/${name}/translations
" "
@ -98,6 +104,7 @@ stdenv.mkDerivation rec {
''; '';
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = configureFlags =
'' ''
-v -no-separate-debug-info -release -no-fast -confirm-license -opensource -v -no-separate-debug-info -release -no-fast -confirm-license -opensource
@ -153,6 +160,11 @@ stdenv.mkDerivation rec {
sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
''; '';
postInstall =
''
rm -rf $out/tests
'';
crossAttrs = let crossAttrs = let
isMingw = stdenv.cross.libc == "msvcrt"; isMingw = stdenv.cross.libc == "msvcrt";
in { in {