diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/applications/misc/mysql-workbench/default.nix | |
parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/applications/misc/mysql-workbench/default.nix')
-rw-r--r-- | pkgs/applications/misc/mysql-workbench/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index d9ce635f80bb1..056edd801c074 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext +{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file , glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool , libctemplate, libglade , libiodbc -, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql +, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo }: @@ -16,18 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6"; }; - buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool - libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa + buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool + libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; preConfigure = '' substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" ''; - postConfigure = '' - autoreconf -fi - ''; - postInstall = '' patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh |