diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-11-15 20:39:07 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-11-29 10:11:42 +0800 |
| commit | 7e4fb8daf5d727b00660949a7ef2d4dd50fc6152 (patch) | |
| tree | 461e450641cbcc5591257401d09e5095e493d92d /pkgs | |
| parent | b40cf400d68dd3b9e3fc0b19484b55e69ca752b1 (diff) | |
| download | nixpkgs-7e4fb8daf5d727b00660949a7ef2d4dd50fc6152.tar nixpkgs-7e4fb8daf5d727b00660949a7ef2d4dd50fc6152.tar.gz nixpkgs-7e4fb8daf5d727b00660949a7ef2d4dd50fc6152.tar.bz2 nixpkgs-7e4fb8daf5d727b00660949a7ef2d4dd50fc6152.tar.lz nixpkgs-7e4fb8daf5d727b00660949a7ef2d4dd50fc6152.tar.xz nixpkgs-7e4fb8daf5d727b00660949a7ef2d4dd50fc6152.tar.zst nixpkgs-7e4fb8daf5d727b00660949a7ef2d4dd50fc6152.zip | |
python3.pkgs.xapp: 2.2.2 -> 2.4.0
Switched to meson. https://github.com/linuxmint/python3-xapp/compare/2.2.2...2.4.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/xapp/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 1 |
2 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 333f544c151..9613ccbeb06 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 8e25b0335c6..b4d868253c0 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; }; |