diff --git a/pkgs/adwcustomizer/default.nix b/pkgs/adwcustomizer/default.nix index 3c23f797..7f0ab544 100644 --- a/pkgs/adwcustomizer/default.nix +++ b/pkgs/adwcustomizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, wrapGAppsHook4, meson, ninja, pkg-config, glib, desktop-file-utils, gettext, blueprint-compiler, python3Packages, appstream-glib, gtk4, libadwaita }: +{ stdenv, lib, fetchFromGitHub, wrapGAppsHook4, meson, ninja, pkg-config, glib, desktop-file-utils, gettext, blueprint-compiler, python3Packages, appstream-glib, gtk4, libadwaita, libportal, libportal-gtk4 }: # Not all parts of the application works with the current nixpkgs version of # libadwaita. @@ -9,8 +9,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "ArtyIF"; repo = "AdwCustomizer"; - rev = "718f2490c95de60e8571b1a9d92af78919c14de1"; - sha256 = "sha256-rMaWIJBQ+HC1Gs5xCRyuOCvB2XcTFB2q194bfK5Q48Q="; + rev = "5a6fa1b2ba63a5a8ac3861f28882c4e62f62b10b"; + sha256 = "sha256-KwvAlcRfilu/rC6e145xMC/6I7OXsZYWlYd0GNZoYDs"; }; patches = [ @@ -32,10 +32,13 @@ python3Packages.buildPythonApplication rec { blueprint-compiler gtk4 libadwaita + libportal + libportal-gtk4 ]; propagatedBuildInputs = with python3Packages; [ pygobject3 + anyascii ]; preFixup = '' diff --git a/pkgs/adwcustomizer/patches/update-non-flatpak-env.patch b/pkgs/adwcustomizer/patches/update-non-flatpak-env.patch index 20ef44b4..f0d9678a 100644 --- a/pkgs/adwcustomizer/patches/update-non-flatpak-env.patch +++ b/pkgs/adwcustomizer/patches/update-non-flatpak-env.patch @@ -1,15 +1,16 @@ diff --git a/src/main.py b/src/main.py -index b73c749..97e2b24 100644 +index 8aadfe0..d2c5d4c 100644 --- a/src/main.py +++ b/src/main.py -@@ -295,5 +295,10 @@ class AdwcustomizerApplication(Adw.Application): +@@ -369,5 +369,10 @@ class AdwcustomizerApplication(Adw.Application): def main(version): """The application's entry point.""" +- app = AdwcustomizerApplication(version) + if not os.getenv("XDG_CONFIG_HOME"): + os.environ["XDG_CONFIG_HOME"] = os.path.expanduser("~/.config") + app_config = os.path.join(os.environ["XDG_CONFIG_HOME"], "adwcustomizer") + os.makedirs(app_config, exist_ok=True) + - app = AdwcustomizerApplication() ++ app = AdwcustomizerApplication(version) return app.run(sys.argv) diff --git a/pkgs/default.nix b/pkgs/default.nix index 7724d8ba..b479630a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,7 +6,7 @@ let packages = self: let callPackage = newScope self; in { - adwcustomizer = callPackage ./adwcustomizer { }; + adwcustomizer = callPackage ./adwcustomizer { libadwaita = libadwaita-latest; }; artem = callPackage ./artem.nix { }; auto-editor = callPackage ./auto-editor.nix { }; awesome-cli = callPackage ./awesome-cli { }; @@ -29,6 +29,16 @@ let guile-hall = callPackage ./guile-hall.nix { }; hush-shell = callPackage ./hush-shell.nix { }; ictree = callPackage ./ictree.nix { }; + libadwaita-latest = libadwaita.overrideAttrs (super: self: { + version = "2022-07-27"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libadwaita"; + rev = "68bf0fbcfb9134bbc13345d16243ff15b1989693"; + hash = "sha256-HWtDpOsHMR2kG5nr6pfznhDoyRpGihLCA7hsT99QqdA="; + }; + }); libcs50 = callPackage ./libcs50.nix { }; license-cli = callPackage ./license-cli { }; moac = callPackage ./moac.nix { };