This patch allows the Haskell daemons to locate Python libraries
installed to a non-standard pythondir.  It is necessary because Guix
does not use versionedsharedir (see related patch that disables it).

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,6 +83,7 @@ myexeclibdir = $(pkglibdir)
 bindir = $(versiondir)/$(BINDIR)
 sbindir = $(versiondir)$(SBINDIR)
 mandir = $(versionedsharedir)/root$(MANDIR)
+pythondir = $(versionedsharedir)
 pkgpythondir = $(versionedsharedir)/ganeti
 pkgpython_rpc_stubdir = $(versionedsharedir)/ganeti/rpc/stub
 gntpythondir = $(versionedsharedir)
@@ -2386,6 +2387,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \
 	    -DPKGLIBDIR="$(libdir)/ganeti" \
 	    -DSHAREDIR="$(prefix)/share/ganeti" \
 	    -DVERSIONEDSHAREDIR="$(versionedsharedir)" \
+	    -DPYTHONDIR="$(pythondir)" \
 	    -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
 	    -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
 	    -DSYSLOG_USAGE="$(SYSLOG_USAGE)" \
diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in
--- a/src/AutoConf.hs.in
+++ b/src/AutoConf.hs.in
@@ -157,6 +157,9 @@ sharedir = "SHAREDIR"
 versionedsharedir :: String
 versionedsharedir = "VERSIONEDSHAREDIR"
 
+pythondir :: String
+pythondir = "PYTHONDIR"
+
 drbdBarriers :: String
 drbdBarriers = "DRBD_BARRIERS"
 
diff --git a/src/Ganeti/Path.hs b/src/Ganeti/Path.hs
--- a/src/Ganeti/Path.hs
+++ b/src/Ganeti/Path.hs
@@ -188,5 +188,5 @@ getInstReasonFilename instName = instanceReasonDir `pjoin` instName
 
 -- | The path to the Python executable for starting jobs.
 jqueueExecutorPy :: IO FilePath
-jqueueExecutorPy = return $ versionedsharedir
-                            </> "ganeti" </> "jqueue" </> "exec.py"
+jqueueExecutorPy = return $ pythondir
+                           </> "ganeti" </> "jqueue" </> "exec.py"
diff --git a/src/Ganeti/Query/Exec.hs b/src/Ganeti/Query/Exec.hs
--- a/src/Ganeti/Query/Exec.hs
+++ b/src/Ganeti/Query/Exec.hs
@@ -99,12 +99,12 @@ spawnJobProcess jid = withErrorLogAt CRITICAL (show jid) $
   do
     use_debug <- isDebugMode
     env_ <- (M.toList . M.insert "GNT_DEBUG" (if use_debug then "1" else "0")
-            . M.insert "PYTHONPATH" AC.versionedsharedir
+            . M.insert "PYTHONPATH" AC.pythondir
             . M.fromList)
            `liftM` getEnvironment
     execPy <- P.jqueueExecutorPy
     logDebug $ "Executing " ++ AC.pythonPath ++ " " ++ execPy
-               ++ " with PYTHONPATH=" ++ AC.versionedsharedir
+               ++ " with PYTHONPATH=" ++ AC.pythondir
 
     (master, child) <- pipeClient connectConfig
     let (rh, wh) = clientToHandle child

>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-06-01 11:37:24 -0700'>2020-06-01</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=8159ce1970d91567468cf1bacac313099a009d2a'>gnu: bootstrap: Add powerpc64-linux dynamic linker.</a><span class='msg-avail'>...</span></td><td>Léo Le Bouter</td></tr>
<tr><td><span title='2020-05-22 01:29:39 +0200'>2020-05-22</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=ce0be5675b702b2ff89aed1772ebb42af4150243'>packages: Introduce &lt;content-hash&gt; and use it in &lt;origin&gt;.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-26 12:58:51 +0100'>2020-03-26</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=6741f543e6f09069961edd741cd210b7f49aadcc'>gnu: bootstrap: Add support for the Hurd.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-03-24 23:31:34 +0100'>2020-03-24</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=fef77109370e6bda675297f74ac1073bfe5518ec'>gnu: bootstrap: Use fall-back mechanism for bootstrap-executables.</a><span class='msg-avail'>...</span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2020-02-17 23:21:03 +0100'>2020-02-17</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=d77860dbc8fc9fc494fec68da2b81fecd59db8a1'>gnu: bootstrap: Remove %bootstrap-coreutils&amp;co, %bootstrap-bash.</a><span class='msg-avail'>...</span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2020-02-17 23:16:39 +0100'>2020-02-17</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=6fc09bd74fd529f336a2d1539eb65063c6e31ff4'>gnu: bootstrap: Add janneke's guix package url.</a><span class='msg-avail'>...</span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2019-11-04 23:35:31 +0100'>2019-11-04</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=7e1a74da93319a3b413854a052af1e9ccca02bdc'>gnu: bootstrap: Memoize 'bootstrap-origin'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-27 23:05:01 +0100'>2019-10-27</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=ac19950507e941b6263f62f4ee4e8934c1b1598e'>gnu: bootstrap: Cache the 'bootstrap-executable' origins.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-27 23:05:00 +0100'>2019-10-27</span></td><td><a href='/guix/commit/gnu/packages/bootstrap.scm?id=5166d027308f4cf694f5cff1c0670b6ff622c226'>gnu: bootstrap: 'bootstrap-origin' preserves eq?-ness when no changes are made.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>