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 >)Author 2024-09-27gnu: telegram-desktop: Use xdg-desktop-portal-next....* gnu/packages/telegram.scm (telegram-desktop) [native-inputs]: Replace xdg-desktop-portal with xdg-desktop-portal-next. Change-Id: Icd0bc0d731e0ece576b590f34960d55f79ef4b43 Maxim Cournoyer 2024-09-26gnu: telegraph-desktop: Fix exhuberant build memory requirements....From 25 GiB to 1.3 GiB. * gnu/packages/telegram.scm (telegram-desktop) [configure-flags]: Specify the 'Release' build type. Change-Id: I040d79d341412d43e864c95b315c1c8ad5fd19ae Maxim Cournoyer 2024-09-26gnu: telegram-desktop: Update to 5.5.5....* gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: Update patch file to match upstream changes. * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: Update patch file to match upstream changes. * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/telegram.scm: (libyuv-for-telegram-desktop, cmake-helpers-for-telegram-desktop) (codegen-for-telegram-desktop, lib-base-for-telegram-desktop) (lib-crl-for-telegram-desktop, lib-lottie-for-telegram-desktop) (lib-qr-for-telegram-desktop, lib-storage-for-telegram-desktop) (lib-tl-for-telegram-desktop, lib-webrtc-for-telegram-desktop) (tgcalls-for-telegram-desktop, webrtc-for-telegram-desktop): Bump to submodule checkout. (cmake-helpers-for-telegram-desktop)[origin]: Add patches to unbundle gsl and cppgir. (libprisma-for-telegram-desktop): Use %telegram-version. (telegram-desktop): Update to 5.5.5. [:configure-flags]: Add disable jemalloc flag. [#:phases]<unpack-additional-sources>: Add libprisma-for-telegram-desktop. <patch-gir-ignore-paths>: New phase. <use-system-xdg-desktop-portal>: New phase. <patch-libwebview>: New phase. [native-inputs]: Add cpp-ada-url-parser, gobject-introspection and xdg-desktop-portal. [inputs]: Add boost, cppgir-for-telegram-desktop, expected-lite and remove jemalloc. Change-Id: I0ea3ea5a3e416a9d5b2b5b7b55ca1af679bc3d38 Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> dan 2024-09-26gnu: Add libprisma-for-telegram-desktop....* gnu/packages/telegram.scm (libprisma-for-telegram-desktop): New variable. Change-Id: I855b463993654a8cad491c7b56c9581b3083f5e4 Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> dan