diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-22 18:25:31 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-23 08:57:37 +0700 |
| commit | acc5f7b18a60bc9b1024e5e1882bf7362e6492e6 (patch) | |
| tree | 597dab74ebab3915ddff291ec6aa4913f4010c68 /pkgs/development/compilers/gcc/common/configure-flags.nix | |
| parent | bbaff89ceb389e9c21a90eefac60ebc9853144be (diff) | |
| download | nixpkgs-acc5f7b18a60bc9b1024e5e1882bf7362e6492e6.tar nixpkgs-acc5f7b18a60bc9b1024e5e1882bf7362e6492e6.tar.gz nixpkgs-acc5f7b18a60bc9b1024e5e1882bf7362e6492e6.tar.bz2 nixpkgs-acc5f7b18a60bc9b1024e5e1882bf7362e6492e6.tar.lz nixpkgs-acc5f7b18a60bc9b1024e5e1882bf7362e6492e6.tar.xz nixpkgs-acc5f7b18a60bc9b1024e5e1882bf7362e6492e6.tar.zst nixpkgs-acc5f7b18a60bc9b1024e5e1882bf7362e6492e6.zip | |
pkgs/development/compilers: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/compilers/gcc/common/configure-flags.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/configure-flags.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 12d3f5d8987..3f1866713e6 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , targetPackages , crossStageStatic, libcCross @@ -24,8 +24,8 @@ , langJit }: -assert cloog != null -> stdenv.lib.versionOlder version "5"; -assert langJava -> stdenv.lib.versionOlder version "7"; +assert cloog != null -> lib.versionOlder version "5"; +assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] # sjlj (short jump long jump) exception handling makes no sense on x86_64, @@ -171,7 +171,7 @@ let ++ lib.optional javaAwtGtk "--enable-java-awt=gtk" ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" - ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) + ++ (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" |