diff options
author | Francois-Rene Rideau <fare@tunes.org> | 2018-08-10 15:41:15 -0400 |
---|---|---|
committer | Francois-Rene Rideau <fare@tunes.org> | 2018-08-11 14:07:15 -0400 |
commit | d9f419bd5708e2ca5abda440ab2d2bd60875769c (patch) | |
tree | 98aa83275ab351dc862c6998b9aa69bd9ef66232 /pkgs | |
parent | c75576f9e8600f5657ac39ad1ae0854075ccef72 (diff) | |
download | nixlib-d9f419bd5708e2ca5abda440ab2d2bd60875769c.tar nixlib-d9f419bd5708e2ca5abda440ab2d2bd60875769c.tar.gz nixlib-d9f419bd5708e2ca5abda440ab2d2bd60875769c.tar.bz2 nixlib-d9f419bd5708e2ca5abda440ab2d2bd60875769c.tar.lz nixlib-d9f419bd5708e2ca5abda440ab2d2bd60875769c.tar.xz nixlib-d9f419bd5708e2ca5abda440ab2d2bd60875769c.tar.zst nixlib-d9f419bd5708e2ca5abda440ab2d2bd60875769c.zip |
gambit, gerbil: use stdenv = gccStdenv
clang builds gambit 10x slower to produce code that is 3x slower than when using GCC. So use GCC to build Gambit and Gerbil.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/gambit/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/gambit/unstable.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/gerbil/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/gerbil/unstable.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
5 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 77e8fb51602c..36aa73f7274b 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl }: +{ stdenv, callPackage, fetchurl }: callPackage ./build.nix { version = "4.8.9"; @@ -7,4 +7,5 @@ callPackage ./build.nix { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 85e940eea570..41d0ee930bf0 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchgit }: +{ stdenv, callPackage, fetchgit }: callPackage ./build.nix { version = "unstable-2018-08-06"; @@ -8,4 +8,5 @@ callPackage ./build.nix { rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f"; sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index eaab0e71d3bd..6fa9fcc3de88 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, gambit }: +{ stdenv, callPackage, fetchurl, gambit }: callPackage ./build.nix { version = "0.12-RELEASE"; @@ -8,4 +8,5 @@ callPackage ./build.nix { url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz"; sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 9366721faf5d..66ead04b5429 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchgit, gambit-unstable }: +{ stdenv, callPackage, fetchgit, gambit-unstable }: callPackage ./build.nix { version = "unstable-2018-08-11"; @@ -9,4 +9,5 @@ callPackage ./build.nix { rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686"; sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s"; }; + inherit stdenv; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ce802c2fb73..9c9e277d7d28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6307,10 +6307,10 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; - gerbil = callPackage ../development/compilers/gerbil { }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; |