Unverified Commit 7d01494b authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #330085 from joshheinrichs-shopify/fix-percona-server-scripts 

percona: fix references to utilities in scripts
parents 410777e6 a5dcd41e

pkgs/servers/sql/percona-server/innovation.nix

+14 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, bison, cmake, pkg-config

, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2

, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests

, coreutils, procps, gnused, gnugrep, hostname, makeWrapper

, systemd

# Percona-specific deps

, coreutils, cyrus_sasl, gnumake, openldap

, cyrus_sasl, gnumake, openldap

# optional: different malloc implementations

, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools

}:
@@ -20,8 +21,11 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg";

  };



  nativeBuildInputs = [ bison cmake pkg-config ]

    ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];

  nativeBuildInputs = [

    bison cmake pkg-config makeWrapper

    # required for scripts/CMakeLists.txt

    coreutils gnugrep procps

  ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];



  patches = [

    ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
@@ -88,6 +92,13 @@ stdenv.mkDerivation (finalAttrs: { 
    moveToOutput "lib/*.a" $static

    so=${stdenv.hostPlatform.extensions.sharedLibrary}

    ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so



    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}

    wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}

    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}

    wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}

  '' + lib.optionalString stdenv.isDarwin ''

    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}

  '';



  passthru = {

pkgs/servers/sql/percona-server/lts.nix

+13 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, bison, cmake, pkg-config

, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2

, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests

, coreutils, procps, gnused, gnugrep, hostname, makeWrapper

# Percona-specific deps

, coreutils, cyrus_sasl, gnumake, openldap

, cyrus_sasl, gnumake, openldap

}:



stdenv.mkDerivation (finalAttrs: {
@@ -14,8 +15,11 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ=";

  };



  nativeBuildInputs = [ bison cmake pkg-config ]

    ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];

  nativeBuildInputs = [

    bison cmake pkg-config makeWrapper

    # required for scripts/CMakeLists.txt

    coreutils gnugrep procps

  ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];



  patches = [

    ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
@@ -73,6 +77,12 @@ stdenv.mkDerivation (finalAttrs: { 
    moveToOutput "lib/*.a" $static

    so=${stdenv.hostPlatform.extensions.sharedLibrary}

    ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so



    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}

    wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}

    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}

    wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}

    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}

  '';



  passthru = {