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

Merge pull request #34047 from ttuegel/bugfix/qt-5/NIX_CFLAGS_COMPILE

Browse Source 
Qt 5: Fix debug flags
This commit is contained in:
Thomas Tuegel 2018-01-20 11:51:37 -06:00 committed by GitHub
commit 88464ecaca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/5.10/default.nix
View File

@ -24,7 +24,7 @@ top-level attribute to `top-level/all-packages.nix`.
# options # options
developerBuild ? false, developerBuild ? false,
decryptSslTraffic ? false, decryptSslTraffic ? false,
debug ? null, debug ? false,
}: }:
with stdenv.lib; with stdenv.lib;

2
pkgs/development/libraries/qt-5/5.6/default.nix
View File

@ -33,7 +33,7 @@ existing packages here and modify it as necessary.
# options # options
developerBuild ? false, developerBuild ? false,
decryptSslTraffic ? false, decryptSslTraffic ? false,
debug ? null, debug ? false,
}: }:
with stdenv.lib; with stdenv.lib;

2
pkgs/development/libraries/qt-5/5.9/default.nix
View File

@ -24,7 +24,7 @@ top-level attribute to `top-level/all-packages.nix`.
# options # options
developerBuild ? false, developerBuild ? false,
decryptSslTraffic ? false, decryptSslTraffic ? false,
debug ? null, debug ? false,
}: }:
with stdenv.lib; with stdenv.lib;

15
pkgs/development/libraries/qt-5/mkDerivation.nix
View File

@ -11,17 +11,18 @@ let
qmakeFlags = qmakeFlags =
(args.qmakeFlags or []) (args.qmakeFlags or [])
++ optional (debug != null) ++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ];
(if debug then "CONFIG+=debug" else "CONFIG+=release");
NIX_CFLAGS_COMPILE = optional (debug != null) "-DQT_NO_DEBUG"; NIX_CFLAGS_COMPILE =
optional (!debug) "-DQT_NO_DEBUG"
++ lib.toList (args.NIX_CFLAGS_COMPILE or []);
cmakeFlags = cmakeFlags =
(args.cmakeFlags or []) (args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ] ++ [
++ optional (debug != null) "-DBUILD_TESTING=OFF"
(if debug then "-DCMAKE_BUILD_TYPE=Debug" ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release"))
else "-DCMAKE_BUILD_TYPE=Release"); ];
enableParallelBuilding = args.enableParallelBuilding or true; enableParallelBuilding = args.enableParallelBuilding or true;