From c1720b412b955fa7739f880738a3284a2d5b4460 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 19 Jan 2018 07:50:54 -0600 Subject: [PATCH] qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags along with the common flags. See also: #34039 #34038 #33935 #33933 #33930 #33927 --- pkgs/development/libraries/qt-5/mkDerivation.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 97bd09c327b..616c96a21fb 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -14,7 +14,10 @@ let ++ optional (debug != null) (if debug then "CONFIG+=debug" else "CONFIG+=release"); - NIX_CFLAGS_COMPILE = optional (debug != null) "-DQT_NO_DEBUG"; + NIX_CFLAGS_COMPILE = + let arg = args.NIX_CFLAGS_COMPILE or []; in + optional (debug == true) "-DQT_NO_DEBUG" + ++ (if builtins.isList arg then arg else [arg]); cmakeFlags = (args.cmakeFlags or [])