diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-06-29 08:48:58 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-07-07 05:56:46 -0700 |
commit | e99f6372fab940ca96c399055b2dcb7c6160fc3e (patch) | |
tree | 170278bd96aee8e593968d6149ac395e2b79b4c5 | |
parent | 5eaf17927e285e207d66fcf497707a8af22ac0b9 (diff) |
gcc: use callFile instead of callPackage for builder.nix
-rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/11/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/12/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/13/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/8/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 31b35b49cdf3b..ff473019de775 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index ec283828e4c85..b009972307740 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index b0a298ec08ef6..da9ebb0a63c17 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/13/default.nix b/pkgs/development/compilers/gcc/13/default.nix index 4cf0919c56160..82b30a0e5102d 100644 --- a/pkgs/development/compilers/gcc/13/default.nix +++ b/pkgs/development/compilers/gcc/13/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index c047f58845b68..acc8ba41a00b2 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index fe12933750654..fadc9b72c45fc 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 2ad2a79cad6a1..f19c2b4f46c8a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e341c57ec7dd6..72e241214fe46 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 59be3ecc8a8b7..274373a4fc8f3 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 512047d4c4f66..d08de2a5b79ce 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -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; |