Skip to content

Commit

Permalink
gcc/{11,12}: use lib.pipe
Browse files Browse the repository at this point in the history
This commit has no effect on eval.  It simply reorganizes the
`gcc11` and `gcc12` expressions so they apply a list of
`overrideAttrs`.  The list is currently empty.
  • Loading branch information
Adam Joseph committed Apr 2, 2023
1 parent 70d3458 commit fdd49f1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions pkgs/development/compilers/gcc/11/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ let majorVersion = "11";

in

stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;

Expand Down Expand Up @@ -310,4 +310,6 @@ stdenv.mkDerivation ({
}

// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
))
[
]
7 changes: 5 additions & 2 deletions pkgs/development/compilers/gcc/12/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ let majorVersion = "12";

in

stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;

Expand Down Expand Up @@ -344,4 +344,7 @@ stdenv.mkDerivation ({
}

// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
))
[
]

0 comments on commit fdd49f1

Please sign in to comment.