From c5d7fc0b3cfa92f7b0442b1828495d46ccee52ba Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 7 Jul 2022 21:31:10 +0300 Subject: [PATCH] python310Packages.pygobject3: fix cross --- pkgs/development/python-modules/pygobject/3.nix | 15 ++++++++++++++- pkgs/top-level/python-packages.nix | 3 ++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 447d49a9442e..199435c935c9 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -12,6 +12,7 @@ , ninja , isPy3k , gnome +, python }: buildPythonPackage rec { @@ -29,6 +30,10 @@ buildPythonPackage rec { sha256 = "HzS192JN415E61p+tCg1MoW9AwBNVRMaX39/qbkPPMk="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ pkg-config meson @@ -37,8 +42,9 @@ buildPythonPackage rec { ]; buildInputs = [ - glib + # # .so files link to these gobject-introspection + glib ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; @@ -48,6 +54,13 @@ buildPythonPackage rec { cairo ]; + mesonFlags = [ + # This is only used for figuring out what version of Python is in + # use, and related stuff like figuring out what the install prefix + # should be, but it does need to be able to execute Python code. + "-Dpython=${python.pythonForBuild.interpreter}" + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0006a47025ef..8e42b113688a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7472,7 +7472,8 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson; + # inherit (pkgs) meson won't work because it won't be spliced + inherit (pkgs.buildPackages) meson; }; pygogo = callPackage ../development/python-modules/pygogo { };