diff --git a/iso/common.nix b/iso/common.nix index 4ff7997..24bada8 100644 --- a/iso/common.nix +++ b/iso/common.nix @@ -3,12 +3,8 @@ let sovranSource = builtins.path { path = ../.; name = "sovran-systemsos"; }; - pythonEnv = pkgs.python3.withPackages (ps: [ ps.pygobject3 ]); - installerPy = pkgs.writeShellScriptBin "sovran-install" '' - export GI_TYPELIB_PATH=/run/current-system/sw/lib/girepository-1.0 - export LD_LIBRARY_PATH=/run/current-system/sw/lib - exec ${pythonEnv}/bin/python3 /etc/sovran/installer.py + exec ${pkgs.python3}/bin/python3 /etc/sovran/installer.py ''; in { @@ -38,13 +34,7 @@ in environment.systemPackages = with pkgs; [ installerPy - pythonEnv - gtk4 - libadwaita - gobject-introspection - glib - pango - gdk-pixbuf + python3Packages.pygobject3 util-linux disko parted @@ -64,7 +54,7 @@ in [Desktop Entry] Type=Application Name=Sovran Guided Installer -Exec=bash -c "DISPLAY=:0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus ${installerPy}/bin/sovran-install" +Exec=${installerPy}/bin/sovran-install Terminal=false X-GNOME-Autostart-enabled=true '';