From ca149f2be05b677ccd4a1f8b502c242bc85747c6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 29 Mar 2015 13:29:57 -0700
Subject: [PATCH] nixos/mysql: All versions of mysql have mysqld in /bin

---
 nixos/modules/services/databases/mysql.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index b94a3fbf3de..1e2400d84b3 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -10,8 +10,6 @@ let
 
   is55 = mysql.mysqlVersion == "5.5";
 
-  mysqldDir = if is55 then "${mysql}/bin" else "${mysql}/libexec";
-
   pidFile = "${cfg.pidDir}/mysqld.pid";
 
   mysqldOptions =
@@ -182,7 +180,7 @@ in
             chown -R ${cfg.user} ${cfg.pidDir}
           '';
 
-        serviceConfig.ExecStart = "${mysqldDir}/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+        serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
 
         postStart =
           ''