diff --git a/iso/common.nix b/iso/common.nix index 2dc74d0..d3b749f 100644 --- a/iso/common.nix +++ b/iso/common.nix @@ -3,8 +3,12 @@ let sovranSource = builtins.path { path = ../.; name = "sovran-systemsos"; }; + pythonEnv = pkgs.python3.withPackages (ps: [ ps.pygobject3 ]); + installerPy = pkgs.writeShellScriptBin "sovran-install" '' - exec ${pkgs.python3.withPackages (ps: [ ps.pygobject3 ])}/bin/python3 /etc/sovran/installer.py + 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:$GI_TYPELIB_PATH + export LD_LIBRARY_PATH=${pkgs.gtk4}/lib:${pkgs.libadwaita}/lib:${pkgs.glib}/lib:$LD_LIBRARY_PATH + exec ${pythonEnv}/bin/python3 /etc/sovran/installer.py ''; in { @@ -34,10 +38,13 @@ in environment.systemPackages = with pkgs; [ installerPy - (python3.withPackages (ps: [ ps.pygobject3 ])) + pythonEnv gtk4 libadwaita gobject-introspection + glib + pango + gdk-pixbuf util-linux disko parted diff --git a/result b/result index eb37b95..e15455a 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/mjb94jp3bsb532zc7hsp8wf8v8s450k5-Sovran_SystemsOS.iso \ No newline at end of file +/nix/store/h0pnn1917vmjmdql582r3nfknd45jb5c-Sovran_SystemsOS.iso \ No newline at end of file