summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-07-04 08:20:07 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-07-04 08:20:07 +0100
commit8aaed36df32bcff840489b7083b4cb077a7cf97a (patch)
tree718e4364d56dd970c8e9b595b91ca9bf4e95827a /pkgs/top-level
parentd335ada6fe1397b4d9fc74bbe812922ce073aea6 (diff)
downloadnixpkgs-8aaed36df32bcff840489b7083b4cb077a7cf97a.tar
nixpkgs-8aaed36df32bcff840489b7083b4cb077a7cf97a.tar.gz
nixpkgs-8aaed36df32bcff840489b7083b4cb077a7cf97a.tar.bz2
nixpkgs-8aaed36df32bcff840489b7083b4cb077a7cf97a.tar.lz
nixpkgs-8aaed36df32bcff840489b7083b4cb077a7cf97a.tar.xz
nixpkgs-8aaed36df32bcff840489b7083b4cb077a7cf97a.tar.zst
nixpkgs-8aaed36df32bcff840489b7083b4cb077a7cf97a.zip
archimedes: use latest toolchain, not gcc-6
Without the change archimedes fails to build with latest toolchains as:

    ld: archimedes.c:(.text+0xdac7): undefined reference to `rnd'
    ld: archimedes.c:(.text+0xdeab): undefined reference to `rnd'
    ld: archimedes.c:(.text+0xdf13): undefined reference to `rnd'
    ld: archimedes.c:(.text+0xe3ef): undefined reference to `rnd'
    ld: archimedes.o:archimedes.c:(.text+0xe456): more undefined references to `rnd' follow
    ld: archimedes.o: in function `EMC':
    archimedes.c:(.text+0xf11b): undefined reference to `creation'
    ld: archimedes.c:(.text+0xf5f5): undefined reference to `creation'
    ld: archimedes.c:(.text+0xf826): undefined reference to `creation'
    ld: archimedes.c:(.text+0xf9ce): undefined reference to `creation'

The change happens to fix build against clang as well.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed03cb2a9aa..a781d005836 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33156,9 +33156,7 @@ with pkgs;
 
   astral = callPackage ../applications/science/biology/astral { };
 
-  archimedes = callPackage ../applications/science/electronics/archimedes {
-    stdenv = gcc6Stdenv;
-  };
+  archimedes = callPackage ../applications/science/electronics/archimedes { };
 
   bayescan = callPackage ../applications/science/biology/bayescan { };