From 2f97bd111074abf7c4c95380fed5925a6b1e45f6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 22 Feb 2021 10:38:54 +0800 Subject: [PATCH] mysqltuner: do not pollute global /share --- pkgs/tools/misc/mysqltuner/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index e4bb43dd509..2acbfd41adf 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -5,16 +5,15 @@ stdenv.mkDerivation rec { version = "1.7.21"; src = fetchFromGitHub { - owner = "major"; - repo = "MySQLTuner-perl"; - rev = version; + owner = "major"; + repo = "MySQLTuner-perl"; + rev = version; sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; }; postPatch = '' substituteInPlace mysqltuner.pl \ - --replace '$basic_password_files = "/usr/share/mysqltuner/basic_passwords.txt"' "\$basic_password_files = \"$out/share/basic_passwords.txt\"" \ - --replace '$opt{cvefile} = "/usr/share/mysqltuner/vulnerabilities.csv"' "\$opt{cvefile} = \"$out/share/vulnerabilities.csv\"" + --replace '/usr/share' "$out/share" ''; buildInputs = [ perl ]; @@ -22,10 +21,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p "$out/bin" - install -Dm 0755 mysqltuner.pl "$out/bin/mysqltuner" - install -Dm 0644 basic_passwords.txt "$out/share/basic_passwords.txt" - install -Dm 0644 vulnerabilities.csv "$out/share/vulnerabilities.csv" + install -Dm0555 mysqltuner.pl $out/bin/mysqltuner + install -Dm0444 -t $out/share/mysqltuner basic_passwords.txt vulnerabilities.csv runHook postInstall '';