diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-06-14 19:45:26 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-07-07 05:55:15 -0700 |
commit | e3f05c22aa70784b146d681b68bec8aab86c8e39 (patch) | |
tree | 6bad18b0ec11fb562fa89219b90782be1fa4811b | |
parent | c413f5a6c104ab62c41fb1abba919858a8fac56a (diff) |
gcc: use common/builder.nix
This commit replaces `stdenv.mkDerivation` with `(callPackage ../common/builder.nix {})` in all versions of gcc.
-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 1069ab96b1317..31b35b49cdf3b 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 533da464ad46d..ec283828e4c85 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 02a594be2b57b..b0a298ec08ef6 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 60200bc1e6eaf..4cf0919c56160 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 10a5d7e6a89a1..c047f58845b68 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 1e3c284e0b194..fe12933750654 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 e7c18c8bd6960..2ad2a79cad6a1 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 d677ab5d58d4d..e341c57ec7dd6 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 f008f80c61143..59be3ecc8a8b7 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../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 d0289f6d65beb..512047d4c4f66 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 (stdenv.mkDerivation ({ +lib.pipe ((callPackage ../common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; |