mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
Merge pull request #180086 from trofi/fix-archimedes-off-gcc6
archimedes: use latest toolchain, not gcc-6
This commit is contained in:
commit
2e37f787c9
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "archimedes";
|
||||
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull patch pending upstream inclusion to support c99 toolchains:
|
||||
# https://savannah.gnu.org/bugs/index.php?62703
|
||||
(fetchpatch {
|
||||
name = "c99.patch";
|
||||
url = "https://savannah.gnu.org/bugs/download.php?file_id=53393";
|
||||
sha256 = "1xmy1w4ln1gynldk3srdi2h0fxpx465dsa1yxc3rzrrjpxh6087f";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "GNU package for semiconductor device simulations";
|
||||
homepage = "https://www.gnu.org/software/archimedes";
|
||||
|
@ -33158,9 +33158,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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user