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

Add binutils to ocaml so that static compiler can build correctly (#359231)

Browse Source
This commit is contained in:
Ulrik Strid 2024-11-27 07:48:55 +01:00 committed by GitHub
commit 36bd945fc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ let
safeX11 = stdenv: !(stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isMips || stdenv.hostPlatform.isStatic);
in
{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch
{ lib, stdenv, fetchurl, ncurses, binutils, buildEnv, libunwind, fetchpatch
, libX11, xorgproto, useX11 ? safeX11 stdenv && lib.versionOlder version "4.09"
, aflSupport ? false
, flambdaSupport ? false
@ -111,6 +111,7 @@ stdenv.mkDerivation (args // {
else ["nixpkgs_world"];
buildInputs = optional (lib.versionOlder version "4.07") ncurses
++ optionals useX11 [ libX11 xorgproto ];
depsBuildBuild = [ binutils ];
propagatedBuildInputs = optional spaceTimeSupport libunwind;
installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
preConfigure = optionalString (lib.versionOlder version "4.04") ''