dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pkgsStatic.ocaml: migrate some logic from static adapter to ocaml

Browse Source
This commit is contained in:
Guillaume Girol 2021-08-14 12:00:00 +00:00
parent 9ae5ae736a
commit 6506d2ae4d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ocaml/generic.nix
View File

@ -3,7 +3,7 @@
let let
versionNoPatch = "${toString major_version}.${toString minor_version}"; versionNoPatch = "${toString major_version}.${toString minor_version}";
version = "${versionNoPatch}.${toString patch_version}"; version = "${versionNoPatch}.${toString patch_version}";
safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic);
in in
{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind { lib, stdenv, fetchurl, ncurses, buildEnv, libunwind
@ -13,7 +13,7 @@ in
, spaceTimeSupport ? false , spaceTimeSupport ? false
}: }:
assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert useX11 -> safeX11 stdenv;
assert aflSupport -> lib.versionAtLeast version "4.05"; assert aflSupport -> lib.versionAtLeast version "4.05";
assert flambdaSupport -> lib.versionAtLeast version "4.03"; assert flambdaSupport -> lib.versionAtLeast version "4.03";
assert spaceTimeSupport -> lib.versionAtLeast version "4.04"; assert spaceTimeSupport -> lib.versionAtLeast version "4.04";

2
pkgs/top-level/static.nix
View File

@ -61,7 +61,7 @@ self: super: let
super super
// { // {
lablgtk = null; # Currently xlibs cause infinite recursion lablgtk = null; # Currently xlibs cause infinite recursion
ocaml = super.ocaml.override { useX11 = false; }; ocaml = super.ocaml;
}; };
in { in {