summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-06-14 19:45:26 -0700
committerAdam Joseph <adam@westernsemico.com>2023-07-07 05:55:15 -0700
commite3f05c22aa70784b146d681b68bec8aab86c8e39 (patch)
tree6bad18b0ec11fb562fa89219b90782be1fa4811b
parentc413f5a6c104ab62c41fb1abba919858a8fac56a (diff)
downloadnixpkgs-e3f05c22aa70784b146d681b68bec8aab86c8e39.tar
nixpkgs-e3f05c22aa70784b146d681b68bec8aab86c8e39.tar.gz
nixpkgs-e3f05c22aa70784b146d681b68bec8aab86c8e39.tar.bz2
nixpkgs-e3f05c22aa70784b146d681b68bec8aab86c8e39.tar.lz
nixpkgs-e3f05c22aa70784b146d681b68bec8aab86c8e39.tar.xz
nixpkgs-e3f05c22aa70784b146d681b68bec8aab86c8e39.tar.zst
nixpkgs-e3f05c22aa70784b146d681b68bec8aab86c8e39.zip
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.nix2
-rw-r--r--pkgs/development/compilers/gcc/11/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/12/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/13/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/4.8/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/4.9/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/7/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/8/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/9/default.nix2
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 1069ab96b13..31b35b49cdf 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 533da464ad4..ec283828e4c 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 02a594be2b5..b0a298ec08e 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 60200bc1e6e..4cf0919c561 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 10a5d7e6a89..c047f58845b 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 1e3c284e0b1..fe129337506 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 e7c18c8bd69..2ad2a79cad6 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 d677ab5d58d..e341c57ec7d 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 f008f80c611..59be3ecc8a8 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 d0289f6d65b..512047d4c4f 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;