diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-08-13 15:35:19 +0200 |
|---|---|---|
| committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-08-13 16:25:37 +0200 |
| commit | 34baf00b72ad0932f6a2add6cee88d2e8b7bec8e (patch) | |
| tree | b3e47acccf39cd15a1b2748ae0acc1ed6342ab70 /pkgs/development/libraries/qt-4.x | |
| parent | ed45e731c240196d4ae1717fe0990c2299bd9026 (diff) | |
| download | nixlib-34baf00b72ad0932f6a2add6cee88d2e8b7bec8e.tar nixlib-34baf00b72ad0932f6a2add6cee88d2e8b7bec8e.tar.gz nixlib-34baf00b72ad0932f6a2add6cee88d2e8b7bec8e.tar.bz2 nixlib-34baf00b72ad0932f6a2add6cee88d2e8b7bec8e.tar.lz nixlib-34baf00b72ad0932f6a2add6cee88d2e8b7bec8e.tar.xz nixlib-34baf00b72ad0932f6a2add6cee88d2e8b7bec8e.tar.zst nixlib-34baf00b72ad0932f6a2add6cee88d2e8b7bec8e.zip | |
{qt4,qt3}: Fix breakage after eeb9837beba38e0f5c5e26357e478f74a7f6bc7c
- qt-4: Pass the correct configureFlags, in particular `mk` should prepend `no-` when `cond` is false. - qt-3: simply revert the changes
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 |
1 files changed, 4 insertions, 4 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 463cb2938ede..f7ddf8ff780c 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { configurePlatforms = []; configureFlags = let - mk = cond: name: "-${lib.optionalString cond "no-"}${name}"; + mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; platformFlag = if stdenv.hostPlatform != stdenv.buildPlatform then "-xplatform" @@ -167,9 +167,9 @@ stdenv.mkDerivation rec { "-make" "libs" "-make" "tools" "-make" "translations" "-no-phonon" (mk buildWebkit "webkit") (mk buildMultimedia "multimedia") "-audio-backend" ]) ++ [ - (mk demos "make") "demos" - (mk examples "make") "examples" - (mk docs "make") "docs" + "-${if demos then "" else "no"}make" "demos" + "-${if examples then "" else "no"}make" "examples" + "-${if docs then "" else "no"}make" "docs" ] ++ lib.optional developerBuild "-developer-build" ++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ] ++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ]; |