removed old result and updated common
This commit is contained in:
@@ -3,12 +3,8 @@
|
|||||||
let
|
let
|
||||||
sovranSource = builtins.path { path = ../.; name = "sovran-systemsos"; };
|
sovranSource = builtins.path { path = ../.; name = "sovran-systemsos"; };
|
||||||
|
|
||||||
pythonEnv = pkgs.python3.withPackages (ps: [ ps.pygobject3 ]);
|
|
||||||
|
|
||||||
installerPy = pkgs.writeShellScriptBin "sovran-install" ''
|
installerPy = pkgs.writeShellScriptBin "sovran-install" ''
|
||||||
export GI_TYPELIB_PATH=/run/current-system/sw/lib/girepository-1.0
|
exec ${pkgs.python3}/bin/python3 /etc/sovran/installer.py
|
||||||
export LD_LIBRARY_PATH=/run/current-system/sw/lib
|
|
||||||
exec ${pythonEnv}/bin/python3 /etc/sovran/installer.py
|
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@@ -38,13 +34,7 @@ in
|
|||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
installerPy
|
installerPy
|
||||||
pythonEnv
|
python3Packages.pygobject3
|
||||||
gtk4
|
|
||||||
libadwaita
|
|
||||||
gobject-introspection
|
|
||||||
glib
|
|
||||||
pango
|
|
||||||
gdk-pixbuf
|
|
||||||
util-linux
|
util-linux
|
||||||
disko
|
disko
|
||||||
parted
|
parted
|
||||||
@@ -64,7 +54,7 @@ in
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=Sovran Guided Installer
|
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
|
Terminal=false
|
||||||
X-GNOME-Autostart-enabled=true
|
X-GNOME-Autostart-enabled=true
|
||||||
'';
|
'';
|
||||||
|
|||||||
Reference in New Issue
Block a user