Merge pull request #174034 from risicle/ris-falcon-gcc-10

falcon: use gcc10Stdenv
2 years ago · 13b6e21c20
parent cfa6435564 254ffa6f53
commit 13b6e21c20
2 changed files with 5 additions and 3 deletions
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@ -1,6 +1,6 @@
-{ lib, gccStdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:

-gccStdenv.mkDerivation {
+stdenv.mkDerivation {
  pname = "falcon";
  version = "unstable-2018-10-23";

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -13080,7 +13080,9 @@ with pkgs;

  hop = callPackage ../development/compilers/hop { };

-  falcon = callPackage ../development/interpreters/falcon { };
+  falcon = callPackage ../development/interpreters/falcon {
+    stdenv = gcc10Stdenv;
+  };

  fsharp = callPackage ../development/compilers/fsharp { };