diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-10-25 21:23:27 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-10-25 21:23:27 +0200 |
| commit | 00798308885d76d2ce0c2b92572d0791eb540cb2 (patch) | |
| tree | 6b3fafc6b613e5900e12c7819cfee1deb487986c /pkgs/applications/radio | |
| parent | 0f190ab597664ff12d347d6a7c2763a506acce07 (diff) | |
| parent | 0d6d7a1fc1b7441ce5f6e00f8446083bf8ea5b23 (diff) | |
Merge #195644: mysql57: drop
Diffstat (limited to 'pkgs/applications/radio')
| -rw-r--r-- | pkgs/applications/radio/cqrlog/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/radio/cqrlog/default.nix b/pkgs/applications/radio/cqrlog/default.nix index d86a08f3a1b07..a167642dd7e75 100644 --- a/pkgs/applications/radio/cqrlog/default.nix +++ b/pkgs/applications/radio/cqrlog/default.nix @@ -11,7 +11,7 @@ , libX11 , pango , hamlib -, mysql57 +, mariadb , tqsl , xdg-utils , xplanet @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" # Order is important substituteInPlace src/dData.pas \ - --replace "/usr/bin/mysqld_safe" "${mysql57}/bin/mysqld_safe" \ - --replace "/usr/bin/mysqld" "${mysql57}/bin/mysqld" + --replace "/usr/bin/mysqld_safe" "${mariadb}/bin/mysqld_safe" \ + --replace "/usr/bin/mysqld" "${mariadb}/bin/mysqld" # To be fail when I need to patch a new hardcoded binary ! grep -C src -RC0 "/usr" @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ hamlib - mysql57 + mariadb tqsl xdg-utils xplanet @@ -87,8 +87,10 @@ stdenv.mkDerivation rec { ]; postFixup = '' - libmysqlclient=$(find "${mysql57}/lib" -name "libmysqlclient.so.*" | tail -n1) - patchelf --add-needed "$libmysqlclient" "$out/bin/.cqrlog-wrapped" + libmysqlclient=$(find "${mariadb.client}/lib" -name "libmysqlclient.so" | tail -n1) + patchelf --add-needed "libmysqlclient.so" \ + --add-rpath "$(dirname "$libmysqlclient")" \ + "$out/bin/.cqrlog-wrapped" ''; meta = with lib; { |