diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2019-12-06 10:48:43 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-12-10 18:58:28 +0100 |
commit | 5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 (patch) | |
tree | a99daf1fec35d8eb727627b20ece29c98bc71a47 /pkgs | |
parent | 84c16b7d39daa3a5a04f1a28eaf3db471d7f3171 (diff) | |
download | nixpkgs-5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75.tar nixpkgs-5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75.tar.gz nixpkgs-5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75.tar.bz2 nixpkgs-5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75.tar.lz nixpkgs-5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75.tar.xz nixpkgs-5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75.tar.zst nixpkgs-5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75.zip |
gfortran: use 8.x on darwin
The conditional was introduced in 982d8599fbd9e19bb94e099f07a45697dda38e14, but the build has been fixed since then.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c67aa54fe86..f8413ecfb72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6942,7 +6942,7 @@ in vifm = callPackage ../applications/misc/vifm { }; - vifm-full = callPackage ../applications/misc/vifm { + vifm-full = callPackage ../applications/misc/vifm { mediaSupport = true; inherit lib udisks2 python3; }; @@ -7986,8 +7986,7 @@ in isl = isl_0_17; })); - # Version 8.x is marked broken on Darwin: https://gist.github.com/GrahamcOfBorg/bef0231b7129681950f03c4ac06781c8. - gfortran = if stdenv.isDarwin then gfortran7 else gfortran8; + gfortran = gfortran8; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; |