tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
qt5: debug flag should never be null
Thomas Tuegel
8 years ago
4a39533a
c1720b41
+10
-12
4 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
qt-5
5.10
default.nix
5.6
default.nix
5.9
default.nix
mkDerivation.nix
+1
-1
pkgs/development/libraries/qt-5/5.10/default.nix
···
24
# options
25
developerBuild ? false,
26
decryptSslTraffic ? false,
27
-
debug ? null,
28
}:
29
30
with stdenv.lib;
···
24
# options
25
developerBuild ? false,
26
decryptSslTraffic ? false,
27
+
debug ? false,
28
}:
29
30
with stdenv.lib;
+1
-1
pkgs/development/libraries/qt-5/5.6/default.nix
···
33
# options
34
developerBuild ? false,
35
decryptSslTraffic ? false,
36
-
debug ? null,
37
}:
38
39
with stdenv.lib;
···
33
# options
34
developerBuild ? false,
35
decryptSslTraffic ? false,
36
+
debug ? false,
37
}:
38
39
with stdenv.lib;
+1
-1
pkgs/development/libraries/qt-5/5.9/default.nix
···
24
# options
25
developerBuild ? false,
26
decryptSslTraffic ? false,
27
-
debug ? null,
28
}:
29
30
with stdenv.lib;
···
24
# options
25
developerBuild ? false,
26
decryptSslTraffic ? false,
27
+
debug ? false,
28
}:
29
30
with stdenv.lib;
+7
-9
pkgs/development/libraries/qt-5/mkDerivation.nix
···
11
12
qmakeFlags =
13
(args.qmakeFlags or [])
14
-
++ optional (debug != null)
15
-
(if debug then "CONFIG+=debug" else "CONFIG+=release");
16
17
NIX_CFLAGS_COMPILE =
18
-
let arg = args.NIX_CFLAGS_COMPILE or []; in
19
-
optional (debug == true) "-DQT_NO_DEBUG"
20
-
++ (if builtins.isList arg then arg else [arg]);
21
22
cmakeFlags =
23
(args.cmakeFlags or [])
24
-
++ [ "-DBUILD_TESTING=OFF" ]
25
-
++ optional (debug != null)
26
-
(if debug then "-DCMAKE_BUILD_TYPE=Debug"
27
-
else "-DCMAKE_BUILD_TYPE=Release");
28
29
enableParallelBuilding = args.enableParallelBuilding or true;
30
···
11
12
qmakeFlags =
13
(args.qmakeFlags or [])
14
+
++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ];
0
15
16
NIX_CFLAGS_COMPILE =
17
+
optional (!debug) "-DQT_NO_DEBUG"
18
+
++ lib.toList (args.NIX_CFLAGS_COMPILE or []);
0
19
20
cmakeFlags =
21
(args.cmakeFlags or [])
22
+
++ [
23
+
"-DBUILD_TESTING=OFF"
24
+
("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release"))
25
+
];
26
27
enableParallelBuilding = args.enableParallelBuilding or true;
28