From 3d695c171d8dbed8c7f80a23a56572f01c8304f1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 16 Feb 2024 01:12:41 +0800 Subject: [PATCH] pythonPackages.xrootd: improve xrootd overriding (#289072) Make it easier to override its pkgs.xrootd dependency. - Pass pkgs.xrootd as `xrootd` instead of `pkgs`. - Call with `inherit (pkgs) xrootd;` --- pkgs/development/python-modules/xrootd/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/xrootd/default.nix b/pkgs/development/python-modules/xrootd/default.nix index 626a5e46e4c4..d17a56e2f914 100644 --- a/pkgs/development/python-modules/xrootd/default.nix +++ b/pkgs/development/python-modules/xrootd/default.nix @@ -3,14 +3,14 @@ , cmake , setuptools , wheel -, pkgs +, xrootd }: buildPythonPackage rec { pname = "xrootd"; pyproject = true; - inherit (pkgs.xrootd) version src; + inherit (xrootd) version src; sourceRoot = "${src.name}/bindings/python"; @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; buildInputs = [ - pkgs.xrootd + xrootd ]; dontUseCmakeConfigure = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92354bbb789b..5ab985d51f0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16419,7 +16419,9 @@ self: super: with self; { xpybutil = callPackage ../development/python-modules/xpybutil { }; - xrootd = callPackage ../development/python-modules/xrootd { }; + xrootd = callPackage ../development/python-modules/xrootd { + inherit (pkgs) xrootd; + }; xsdata = callPackage ../development/python-modules/xsdata { };