diff options
| author | Artturin <Artturin@artturin.com> | 2023-02-20 17:17:34 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-02-22 21:23:04 +0200 |
| commit | 6b2a05e19089c2b16c6ed52e7e495f8a9f903c60 (patch) | |
| tree | 30990df54ee4a654a86772f909c5d2c318356419 /pkgs/applications/misc/mysql-workbench/default.nix | |
| parent | f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a (diff) | |
treewide: manual fixups for
treewide: use toString on list NIX_CFLAGS_COMPILE treewide: move NIX_CFLAGS_COMPILE to the env attrset
Diffstat (limited to 'pkgs/applications/misc/mysql-workbench/default.nix')
| -rw-r--r-- | pkgs/applications/misc/mysql-workbench/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 79022bc153180..4ba4d992835ce 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -140,7 +140,7 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated "-Wno-error=deprecated-declarations" ] ++ lib.optionals stdenv.isAarch64 [ @@ -149,7 +149,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ # Needed with GCC 12 but problematic with some old GCCs "-Wno-error=maybe-uninitalized" - ]; + ]); cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" |