gcc: use callFile instead of callPackage for builder.nix
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user