diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 333f544c151e..9613ccbeb06d 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -1,6 +1,9 @@ { lib , fetchFromGitHub , buildPythonPackage +, python +, meson +, ninja , psutil , pygobject3 , gtk3 @@ -11,15 +14,22 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.2.2"; + version = "2.4.0"; + + format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-ntjJ/O6HiRZMsqsuQY4HLM4fBE0aWpn/L4n5YCRlhhg="; + hash = "sha256-qEK71cGNGmaThxlFVsfnLUTD83RTr8GP+501c4UbHCk="; }; + nativeBuildInputs = [ + meson + ninja + ]; + propagatedBuildInputs = [ psutil pygobject3 @@ -33,6 +43,13 @@ buildPythonPackage rec { substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; + postInstall = '' + # This is typically set by pipInstallHook/eggInstallHook, + # so we have to do so manually when using meson. + # https://github.com/NixOS/nixpkgs/issues/175227 + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + doCheck = false; pythonImportsCheck = [ "xapp" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e25b0335c61..b4d868253c04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12053,6 +12053,7 @@ self: super: with self; { }; xapp = callPackage ../development/python-modules/xapp { + inherit (pkgs.buildPackages) meson; inherit (pkgs) gtk3 gobject-introspection polkit; inherit (pkgs.cinnamon) xapp; };