diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-27 14:56:17 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-29 13:05:28 +0200 |
| commit | a5ee4d2c78ad20c73b30717c648fe196b069851d (patch) | |
| tree | 4f54ade9f35bb4cb1877ed9e450eacbed2abc641 /pkgs/development/libraries/qt-4.x | |
| parent | c5ddb7dd56d9eb71cbe0430bcf85596d298caef8 (diff) | |
qt-4: Use multiple outputs
This is a pretty modest use of multiple outputs - mainly to eliminate -dev outputs from Qt's closure.
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a93ae2fc8adfa..8526a5f5b8295 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { 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 version = vers; @@ -87,8 +93,8 @@ stdenv.mkDerivation rec { -docdir $out/share/doc/${name} -plugindir $out/lib/qt4/plugins -importdir $out/lib/qt4/imports - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos + -examplesdir $TMPDIR/share/doc/${name}/examples + -demosdir $TMPDIR/share/doc/${name}/demos -datadir $out/share/${name} -translationdir $out/share/${name}/translations " @@ -98,6 +104,7 @@ stdenv.mkDerivation rec { ''; prefixKey = "-prefix "; + configureFlags = '' -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 ''; + postInstall = + '' + rm -rf $out/tests + ''; + crossAttrs = let isMingw = stdenv.cross.libc == "msvcrt"; in { |