From 5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 6 Dec 2019 10:48:43 +0100 Subject: gfortran: use 8.x on darwin The conditional was introduced in 982d8599fbd9e19bb94e099f07a45697dda38e14, but the build has been fixed since then. --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c67aa54fe86a..f8413ecfb72c 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"; -- cgit 1.4.1