Skip to content

gcc: use standard builder instead of custom builder.sh #237856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artturin merged 9 commits into from Jul 21, 2023
Merged

gcc: use standard builder instead of custom builder.sh #237856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
caf22a3
gcc: copy gcc/builder.sh to gcc/common/builder.nix
Jun 15, 2023
72284b0
gcc: make common/builder.nix into valid Nix syntax
Jun 15, 2023
1157e1d
gcc: add args to common/builder.nix, split up script into phases
Jun 15, 2023
c413f5a
gcc: remove `builder = ../builder.sh` from gcc/${version}/default.nix
Jun 15, 2023
e3f05c2
gcc: use common/builder.nix
Jun 15, 2023
67da7b9
gcc: remove builder.sh
Jun 15, 2023
5eaf179
gcc: add `-g` to `declare`
Jun 16, 2023
e99f637
gcc: use callFile instead of callPackage for builder.nix
Jun 29, 2023
7621636
gcc: use Nix instead of bash for conditional
Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/10/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,10 @@ let majorVersion = "10";

in

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "1wg4xdizkksmwi66mvv2v4pk3ja8x64m7v9gzhykzd3wrmdpsaf9";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,10 @@ let majorVersion = "11";

in

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
hash = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk=";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,10 @@ let majorVersion = "12";

in

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs=";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/13/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,10 @@ let majorVersion = "13";

in

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "sha256-YdaE8Kpedqxlha2ImKJCeq3ol57V5/hUkihsTfwT7oY=";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/4.8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,10 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
sha256 = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/4.9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,10 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
sha256 = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,10 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = if stdenv.targetPlatform.isVc4 then fetchFromGitHub {
owner = "itszor";
repo = "gcc-vc4";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,10 @@ let majorVersion = "7";

in

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,10 @@ let majorVersion = "8";

in

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/compilers/gcc/9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,10 @@ let majorVersion = "9";

in

lib.pipe (stdenv.mkDerivation ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

builder = ../builder.sh;

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7";
Expand Down
Loading