movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/mediagoblin: fix initial media reprocessing with gmg

Browse source 
Running `mediagoblin-gmg reprocess initial` before would fail with
missing GST_PLUGIN_PATH and tools in PATH.

(cherry picked from commit 81d2a488e6)
This commit is contained in:
Sandro Jäckel 2024-12-09 23:10:49 +01:00 • committed by github-actions[bot]
parent b7444e5d11
commit c44d6d705d
1 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nixos/modules/services/web-apps/mediagoblin.nix
View file

@ -25,14 +25,13 @@ let
iniFormat = pkgs.formats.ini { }; iniFormat = pkgs.formats.ini { };
# we need to build our own GI_TYPELIB_PATH because celery and paster need this information, too and cannot easily be re-wrapped # we need to build our own GI_TYPELIB_PATH and GST_PLUGIN_PATH because celery, paster and gmg need this information and it cannot easily be re-wrapped
GI_TYPELIB_PATH = gst =
let let
needsGst = needsGst =
(cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.audio") (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.audio")
|| (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.video"); || (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.video");
in in
lib.makeSearchPathOutput "out" "lib/girepository-1.0" (
with pkgs.gst_all_1; with pkgs.gst_all_1;
[ [
pkgs.glib pkgs.glib
@ -40,7 +39,18 @@ let
gstreamer gstreamer
] ]
# audio and video share most dependencies, so we can just take audio # audio and video share most dependencies, so we can just take audio
++ lib.optionals needsGst cfg.package.optional-dependencies.audio ++ lib.optionals needsGst cfg.package.optional-dependencies.audio;
GI_TYPELIB_PATH = lib.makeSearchPathOutput "out" "lib/girepository-1.0" gst;
GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst;
path =
lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.stl") [ pkgs.blender ]
++ lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.pdf") (
with pkgs;
[
poppler-utils
unoconv
]
); );
finalPackage = cfg.package.python.buildEnv.override { finalPackage = cfg.package.python.buildEnv.override {
@ -189,7 +199,7 @@ in
if [[ "$USER" != mediagoblin ]]; then if [[ "$USER" != mediagoblin ]]; then
sudo='exec /run/wrappers/bin/sudo -u mediagoblin' sudo='exec /run/wrappers/bin/sudo -u mediagoblin'
fi fi
$sudo sh -c "cd /var/lib/mediagoblin; env GI_TYPELIB_PATH=${GI_TYPELIB_PATH} ${lib.getExe' finalPackage "gmg"} $*" $sudo sh -c "cd /var/lib/mediagoblin; env GI_TYPELIB_PATH=${GI_TYPELIB_PATH} GST_PLUGIN_PATH=${GST_PLUGIN_PATH} PATH=$PATH:${lib.makeBinPath path} ${lib.getExe' finalPackage "gmg"} $*"
'') '')
]; ];
@ -248,15 +258,7 @@ in
let let
serviceDefaults = { serviceDefaults = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = inherit path;
lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.stl") [ pkgs.blender ]
++ lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.pdf") (
with pkgs;
[
poppler-utils
unoconv
]
);
serviceConfig = { serviceConfig = {
AmbientCapabilities = ""; AmbientCapabilities = "";
CapabilityBoundingSet = [ "" ]; CapabilityBoundingSet = [ "" ];
@ -325,6 +327,7 @@ in
Environment = [ Environment = [
"CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery" "CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery"
"GI_TYPELIB_PATH=${GI_TYPELIB_PATH}" "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}"
"GST_PLUGIN_PATH=${GST_PLUGIN_PATH}"
"MEDIAGOBLIN_CONFIG=/var/lib/mediagoblin/mediagoblin.ini" "MEDIAGOBLIN_CONFIG=/var/lib/mediagoblin/mediagoblin.ini"
"PASTE_CONFIG=${pasteConfig}" "PASTE_CONFIG=${pasteConfig}"
]; ];
@ -350,6 +353,7 @@ in
Environment = [ Environment = [
"CELERY_ALWAYS_EAGER=false" "CELERY_ALWAYS_EAGER=false"
"GI_TYPELIB_PATH=${GI_TYPELIB_PATH}" "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}"
"GST_PLUGIN_PATH=${GST_PLUGIN_PATH}"
]; ];
ExecStart = "${lib.getExe' finalPackage "paster"} serve /var/lib/mediagoblin/paste.ini"; ExecStart = "${lib.getExe' finalPackage "paster"} serve /var/lib/mediagoblin/paste.ini";
}; };