diff options
author | Guillaume Bouchard <guillaum.bouchard@gmail.com> | 2020-11-04 19:58:32 +0100 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2020-11-04 15:26:29 -0800 |
commit | 2de3de46317f5d95a308542265a4d08e3fb40534 (patch) | |
tree | eacbaed17d4aaebc359874c376b1337704a36f58 /pkgs/applications/misc | |
parent | 2a5b50f67dba187ba21dd56f20ee65f1d04f9059 (diff) |
antlr: 4.7 -> 4.8
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/mysql-workbench/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 63d7077d32e06..71adcdc0757b9 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -9,7 +9,7 @@ , gtkmm3 , pcre , swig -, antlr4_7 +, antlr4_8 , sudo , mysql , libxml2 @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { # have it look for 4.7.2 instead of 4.7.1 preConfigure = '' substituteInPlace CMakeLists.txt \ - --replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar" + --replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar" ''; nativeBuildInputs = [ @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 libX11 - antlr4_7.runtime.cpp + antlr4_8.runtime.cpp python2 mysql libxml2 @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" - "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" + "-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}" # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. |