From f166cb37267dcf51e2f827e5ecf45bcaac4662b1 Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Wed, 12 Nov 2025 23:57:10 +0000 Subject: [PATCH] cockpit: wrap with osinfo and python with gobject Co-authored-by: Alexandru Nechita --- pkgs/by-name/co/cockpit/package.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 3435db365eb9..05ff7c45767e 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -168,7 +168,15 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-prefix-only=yes" "--disable-pcp" # TODO: figure out how to package its dependency - "--with-default-session-path=${placeholder "out"}/bin:/etc/cockpit/bin:${util-linux}/bin:/run/wrappers/bin:/run/current-system/sw/bin" + "--with-default-session-path=${ + lib.makeBinPath [ + (placeholder "out") + "/etc/cockpit" + util-linux + "/run/wrappers" + "/run/current-system/sw" + ] + }" "--with-admin-group=root" # TODO: really? Maybe "wheel"? ]; @@ -192,8 +200,15 @@ stdenv.mkDerivation (finalAttrs: { for binary in $out/bin/cockpit-bridge $out/libexec/cockpit-askpass; do chmod +x $binary wrapProgram $binary \ - --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} \ - --prefix XDG_DATA_DIRS : /etc/cockpit/share # Cockpit apps will be stored at /etc/cockpit/share/cockpit/ (managed by Cockpit nixos service) + --prefix PYTHONPATH : ${ + lib.makeSearchPath python3Packages.python.sitePackages [ + "$out" + python3Packages.pygobject3 + "/etc/cockpit" + ] + } \ + --prefix GI_TYPELIB_PATH : "/etc/cockpit/lib/girepository-1.0" \ + --prefix XDG_DATA_DIRS : "/etc/cockpit/share" done patchShebangs $out/share/cockpit/issue/update-issue