diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-20 09:21:30 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:34:39 +0100 |
| commit | e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac (patch) | |
| tree | 1c6f6921d46f99200e809d02d2c1188b6e04a227 /pkgs/development/libraries/qt-5 | |
| parent | a534e750a82ee6582cbf08ad9c325580c003d3cb (diff) | |
| download | nixpkgs-e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac.tar nixpkgs-e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac.tar.gz nixpkgs-e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac.tar.bz2 nixpkgs-e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac.tar.lz nixpkgs-e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac.tar.xz nixpkgs-e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac.tar.zst nixpkgs-e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac.zip | |
treewide: configureFlags is a flat list
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index cd426884d12..bc23d0f9caf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -170,11 +170,6 @@ stdenv.mkDerivation { export LD=$CXX ''} - configureFlags+="\ - -plugindir $out/$qtPluginPrefix \ - -qmldir $out/$qtQmlPrefix \ - -docdir $out/$qtDocPrefix" - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" ''; @@ -222,6 +217,10 @@ stdenv.mkDerivation { # TODO Remove obsolete and useless flags once the build will be totally mastered configureFlags = [ + "-plugindir $(out)/$(qtPluginPrefix)" + "-qmldir $(out)/$(qtQmlPrefix)" + "-docdir $(out)/$(qtDocPrefix)" + "-verbose" "-confirm-license" "-opensource" |