diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2021-08-05 12:00:00 +0000 |
|---|---|---|
| committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2021-08-19 09:29:55 +0200 |
| commit | 061f70f8f76249394cff90019ce36593d42a1bb8 (patch) | |
| tree | e253fc09e8292ac5eb3edf678f8fe15aa1cf17ca /pkgs/top-level/static.nix | |
| parent | 2970c2834959975c5d5080d1dd23f9d9ad5d7b51 (diff) | |
ocaml: fix static compilation on recent versions
Diffstat (limited to 'pkgs/top-level/static.nix')
| -rw-r--r-- | pkgs/top-level/static.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 73fe6dbc8363a..344ce47fc2ae8 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -61,20 +61,7 @@ self: super: let super // { lablgtk = null; # Currently xlibs cause infinite recursion - ocaml = ((super.ocaml.override { useX11 = false; }).overrideAttrs (o: { - configurePlatforms = [ ]; - dontUpdateAutotoolsGnuConfigScripts = true; - })).overrideDerivation (o: { - preConfigure = '' - configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r") - ''; - dontAddStaticConfigureFlags = true; - configureFlags = [ - "--no-shared-libs" - "-host ${o.stdenv.hostPlatform.config}" - "-target ${o.stdenv.targetPlatform.config}" - ]; - }); + ocaml = super.ocaml.override { useX11 = false; }; }; in { |