Unverified Commit a64a02f6 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

buildPythonPackage: preserve the `disabled` effect after `<pkg>.overrideAttrs` (#376419)

parents bdf2c382 bb3a41f3
Loading
Loading
Loading
Loading
+15 −5
Original line number Diff line number Diff line
@@ -472,11 +472,21 @@ let
  # This derivation transformation function must be independent to `attrs`
  # for fixed-point arguments support in the future.
  transformDrv =
    let
      # Workaround to make the `lib.extendDerivation`-based disabled functionality
      # respect `<pkg>.overrideAttrs`
      # It doesn't cover `<pkg>.<output>.overrideAttrs`.
      disablePythonPackage =
        drv:
        extendDerivation (
          drv.disabled
          -> throw "${removePrefix namePrefix drv.name} not supported for interpreter ${python.executable}"
    ) { } (toPythonModule drv);
        ) { } drv
        // {
          overrideAttrs = fdrv: disablePythonPackage (drv.overrideAttrs fdrv);
        };
    in
    drv: disablePythonPackage (toPythonModule drv);

in
transformDrv self