Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions pkgs/by-name/my/mysql-workbench/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
python3Packages,

cairo,
mysql,
mysql80,
Comment thread
gepbird marked this conversation as resolved.
libiodbc,
proj,

Expand All @@ -41,8 +41,12 @@
}:

let
mysql = mysql80;
gdal' = gdal.override { libmysqlclient = mysql; };
antlr = antlr4_13;

# for some reason the package doesn't build with swig 4.3.0
swig_4_2 = swig.overrideAttrs (prevAttrs: {
swig' = swig.overrideAttrs (prevAttrs: {
version = "4.2.1";
src = prevAttrs.src.override {
hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8=";
Expand Down Expand Up @@ -99,14 +103,14 @@ stdenv.mkDerivation (finalAttrs: {
jre
ninja
pkg-config
swig_4_2
swig'
wrapGAppsHook3
];

buildInputs = [
antlr4_13.runtime.cpp
antlr.runtime.cpp
boost
gdal
gdal'
gtkmm3
libiodbc
libmysqlconnectorcpp
Expand Down Expand Up @@ -147,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeFeature "MySQL_CONFIG_PATH" (lib.getExe' mysql "mysql_config"))
(lib.cmakeFeature "IODBC_CONFIG_PATH" (lib.getExe' libiodbc "iodbc-config"))
(lib.cmakeFeature "ANTLR_JAR_PATH" "${antlr4_13.jarLocation}")
(lib.cmakeFeature "ANTLR_JAR_PATH" "${antlr.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.
Expand Down
12 changes: 0 additions & 12 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13120,18 +13120,6 @@ with pkgs;
}
);

mysql-workbench = callPackage ../by-name/my/mysql-workbench/package.nix (
let
mysql = mysql80;
in
{
gdal = gdal.override {
libmysqlclient = mysql;
};
mysql = mysql;
}
);

pgadmin4-desktopmode = pgadmin4.override { server-mode = false; };

philipstv = with python3Packages; toPythonApplication philipstv;
Expand Down
Loading