From 78291a920f28ca29941c4f6af7a22887efcc9068 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 4 Dec 2017 20:09:30 +0100 Subject: [PATCH] Python: support multiple overrides Fixes https://github.com/NixOS/nixpkgs/issues/32263 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d6dcc396b05..435613e8033d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -43,10 +43,10 @@ let overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // { - overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); + overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); }) else if builtins.isFunction ff then { - overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); + overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); __functor = self: ff; } else ff;