gcc: use callFile instead of callPackage for builder.nix

This commit is contained in:
Adam Joseph 2023-06-29 08:48:58 -07:00
parent 5eaf17927e
commit e99f6372fa
10 changed files with 10 additions and 10 deletions

View File

@ -144,7 +144,7 @@ let majorVersion = "10";
in
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -157,7 +157,7 @@ let majorVersion = "11";
in
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -201,7 +201,7 @@ let majorVersion = "12";
in
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -195,7 +195,7 @@ let majorVersion = "13";
in
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -193,7 +193,7 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -210,7 +210,7 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -199,7 +199,7 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -149,7 +149,7 @@ let majorVersion = "7";
in
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -130,7 +130,7 @@ let majorVersion = "8";
in
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;

View File

@ -144,7 +144,7 @@ let majorVersion = "9";
in
lib.pipe ((callPackage ../common/builder.nix {}) ({
lib.pipe ((callFile ../common/builder.nix {}) ({
pname = "${crossNameAddon}${name}";
inherit version;