Commit 965a81e3 authored by Robert Hensing's avatar Robert Hensing Committed by Jörg Thalheim
Browse files

nixVersions.nix_2_26: Refactor rename nixDefaultsLayer

parent 2850cb73

pkgs/tools/package-management/nix/2_26/packaging/components.nix

+4 −4
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ let 
      mesonFlags = [ (lib.mesonBool "b_asneeded" false) ] ++ prevAttrs.mesonFlags or [ ];

    };



  miscGoodPractice = finalAttrs: prevAttrs: {

  nixDefaultsLayer = finalAttrs: prevAttrs: {

    strictDeps = prevAttrs.strictDeps or true;

    enableParallelBuilding = true;

  };
@@ -276,14 +276,14 @@ in 
    (scope.overrideSource "${./..}").appendPatches patches;



  mkMesonDerivation = mkPackageBuilder [

    miscGoodPractice

    nixDefaultsLayer

    scope.sourceLayer

    setVersionLayer

    mesonLayer

    scope.mesonComponentOverrides

  ];

  mkMesonExecutable = mkPackageBuilder [

    miscGoodPractice

    nixDefaultsLayer

    bsdNoLinkAsNeeded

    scope.sourceLayer

    setVersionLayer
@@ -292,7 +292,7 @@ in 
    scope.mesonComponentOverrides

  ];

  mkMesonLibrary = mkPackageBuilder [

    miscGoodPractice

    nixDefaultsLayer

    bsdNoLinkAsNeeded

    scope.sourceLayer

    mesonLayer