nix: apply mkPretty to sub-derivations
This commit is contained in:
parent
e016c37634
commit
bd3ec3a904
2 changed files with 6 additions and 2 deletions
|
|
@ -9,7 +9,11 @@
|
||||||
in import src { inherit pkgs; },
|
in import src { inherit pkgs; },
|
||||||
}: let
|
}: let
|
||||||
inherit (qpkgs) lib;
|
inherit (qpkgs) lib;
|
||||||
dynix = qpkgs.callPackage ./package.nix { }
|
dynix = (qpkgs.callPackage ./package.nix { })
|
||||||
|
.overrideAttrs (final: prev: {
|
||||||
|
dynixCommand = qpkgs.stdlib.mkStdenvPretty prev.dynixCommand;
|
||||||
|
dynixModules = qpkgs.stdlib.mkStdenvPretty prev.dynixModules;
|
||||||
|
})
|
||||||
|> qpkgs.stdlib.mkStdenvPretty;
|
|> qpkgs.stdlib.mkStdenvPretty;
|
||||||
byStdenv = lib.mapAttrs (stdenvName: stdenv: let
|
byStdenv = lib.mapAttrs (stdenvName: stdenv: let
|
||||||
withStdenv = dynix.override { clangStdenv = stdenv; };
|
withStdenv = dynix.override { clangStdenv = stdenv; };
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
|
|
||||||
mkDevShell = dynix: qpkgs.callPackage dynix.mkDevShell { inherit fenixToolchain; };
|
mkDevShell = dynix: qpkgs.callPackage dynix.mkDevShell { inherit fenixToolchain; };
|
||||||
devShell = mkDevShell dynix;
|
devShell = mkDevShell dynix |> qpkgs.stdlib.mkStdenvPretty;
|
||||||
|
|
||||||
byStdenv = lib.mapAttrs (lib.const mkDevShell) dynix.byStdenv;
|
byStdenv = lib.mapAttrs (lib.const mkDevShell) dynix.byStdenv;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue