From 37cbc94dc6a08f65471bd3f916cd26927839dff6 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:29:47 +0100 Subject: [PATCH] mysql-workbench: clean up unnecessary dependencies --- pkgs/by-name/my/mysql-workbench/package.nix | 64 +++++++-------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 20 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/my/mysql-workbench/package.nix b/pkgs/by-name/my/mysql-workbench/package.nix index 799827233f31..9828074955f2 100644 --- a/pkgs/by-name/my/mysql-workbench/package.nix +++ b/pkgs/by-name/my/mysql-workbench/package.nix @@ -3,45 +3,38 @@ stdenv, fetchurl, replaceVars, + cmake, ninja, pkg-config, - glibc, - gtk3, - gtkmm3, - pcre, + jre, swig, - antlr4_12, + wrapGAppsHook3, + + bash, + coreutils, + glibc, sudo, + + cairo, mysql, + libiodbc, + proj, + + antlr4_12, + gtkmm3, libxml2, libmysqlconnectorcpp, vsqlite, gdal, - libiodbc, - libpthreadstubs, - libXdmcp, + boost, + libssh, + openssl, + rapidjson, libuuid, libzip, libsecret, - libssh, python3Packages, - jre, - boost, - libsigcxx, - libX11, - openssl, - rapidjson, - proj, - cairo, - libxkbcommon, - libepoxy, - wrapGAppsHook3, - at-spi2-core, - dbus, - bash, - coreutils, - zstd, }: let @@ -108,12 +101,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk3 - gtkmm3 - libX11 antlr4_12.runtime.cpp - python3Packages.python - mysql + gtkmm3 (libxml2.override { enableHttp = true; }) libmysqlconnectorcpp vsqlite @@ -122,29 +111,16 @@ stdenv.mkDerivation (finalAttrs: { libssh openssl rapidjson - libiodbc - pcre - cairo libuuid libzip libsecret - libsigcxx - proj + libiodbc # python dependencies: paramiko pycairo pyodbc # TODO: package sqlanydb and add it here - - # transitive dependencies: - libpthreadstubs - libXdmcp - libxkbcommon - libepoxy - at-spi2-core - dbus - zstd ]; env.NIX_CFLAGS_COMPILE = toString ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 841f225681fa..d65e0026d344 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18153,7 +18153,6 @@ with pkgs; libmysqlclient = mysql; }; mysql = mysql; - pcre = pcre-cpp; }); resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };