removed old result and updated common
This commit is contained in:
@@ -5,6 +5,11 @@ let
|
|||||||
|
|
||||||
pythonEnv = pkgs.python3.withPackages (ps: [ ps.pygobject3 ]);
|
pythonEnv = pkgs.python3.withPackages (ps: [ ps.pygobject3 ]);
|
||||||
|
|
||||||
|
installerPy = pkgs.writeShellScriptBin "sovran-install" ''
|
||||||
|
export GI_TYPELIB_PATH=${pkgs.gtk4}/lib/girepository-1.0:${pkgs.libadwaita}/lib/girepository-1.0:${pkgs.glib}/lib/girepository-1.0:${pkgs.pango}/lib/girepository-1.0:${pkgs.gdk-pixbuf}/lib/girepository-1.0:${pkgs.graphene}/lib/girepository-1.0:${pkgs.cairo}/lib/girepository-1.0:${pkgs.harfbuzz}/lib/girepository-1.0
|
||||||
|
export LD_LIBRARY_PATH=${pkgs.gtk4}/lib:${pkgs.libadwaita}/lib:${pkgs.glib}/lib:${pkgs.pango}/lib:${pkgs.gdk-pixbuf}/lib:${pkgs.graphene}/lib:${pkgs.cairo}/lib:${pkgs.harfbuzz}/lib
|
||||||
|
exec ${pythonEnv}/bin/python3 /etc/sovran/installer.py
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
@@ -32,10 +37,17 @@ in
|
|||||||
nix-bitcoin.generateSecrets = true;
|
nix-bitcoin.generateSecrets = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
installerPy
|
||||||
pythonEnv
|
pythonEnv
|
||||||
libadwaita
|
|
||||||
gtk4
|
gtk4
|
||||||
|
libadwaita
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
|
glib
|
||||||
|
pango
|
||||||
|
gdk-pixbuf
|
||||||
|
graphene
|
||||||
|
cairo
|
||||||
|
harfbuzz
|
||||||
util-linux
|
util-linux
|
||||||
disko
|
disko
|
||||||
parted
|
parted
|
||||||
@@ -47,12 +59,6 @@ in
|
|||||||
curl
|
curl
|
||||||
];
|
];
|
||||||
|
|
||||||
# libadwaita and gtk4 typelibs into the session
|
|
||||||
environment.sessionVariables = {
|
|
||||||
GI_TYPELIB_PATH = "${pkgs.libadwaita}/lib/girepository-1.0:${pkgs.gtk4}/lib/girepository-1.0:${pkgs.glib}/lib/girepository-1.0:${pkgs.pango}/lib/girepository-1.0:${pkgs.gdk-pixbuf}/lib/girepository-1.0:${pkgs.graphene}/lib/girepository-1.0";
|
|
||||||
LD_LIBRARY_PATH = "${pkgs.libadwaita}/lib:${pkgs.gtk4}/lib:${pkgs.glib}/lib:${pkgs.pango}/lib:${pkgs.gdk-pixbuf}/lib:${pkgs.graphene}/lib";
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.etc."sovran/logo.png".source = ./assets/splash-logo.png;
|
environment.etc."sovran/logo.png".source = ./assets/splash-logo.png;
|
||||||
environment.etc."sovran/flake".source = sovranSource;
|
environment.etc."sovran/flake".source = sovranSource;
|
||||||
environment.etc."sovran/installer.py".source = ./installer.py;
|
environment.etc."sovran/installer.py".source = ./installer.py;
|
||||||
@@ -61,7 +67,7 @@ in
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=Sovran Guided Installer
|
Name=Sovran Guided Installer
|
||||||
Exec=${pythonEnv}/bin/python3 /etc/sovran/installer.py
|
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