diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 1069ab96b131..31b35b49cdf3 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 533da464ad46..ec283828e4c8 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 02a594be2b57..b0a298ec08ef 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 60200bc1e6ea..4cf0919c5616 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 10a5d7e6a89a..c047f58845b6 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 1e3c284e0b19..fe1293375065 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 e7c18c8bd696..2ad2a79cad6a 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 d677ab5d58d4..e341c57ec7dd 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 f008f80c6114..59be3ecc8a8b 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 d0289f6d65be..512047d4c4f6 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;