Unverified Commit 6598663b authored by Adam Joseph's avatar Adam Joseph Committed by GitHub
Browse files

Merge pull request #192192 from amjoseph-nixpkgs/pr/mercury/jdk_headless 

mercury: use jdk_headless to allow non-gui builds
parents d8409def 8fbe036f

pkgs/development/compilers/mercury/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper

{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk_headless, erlang, makeWrapper

, readline }:



stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [ makeWrapper ];

  buildInputs = [ gcc flex bison texinfo jdk erlang readline ];

  buildInputs = [ gcc flex bison texinfo jdk_headless erlang readline ];



  patchPhase = ''

    # Fix calls to programs in /bin
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 
    for e in $(ls $out/bin) ; do

      wrapProgram $out/bin/$e \

        --prefix PATH ":" "${gcc}/bin" \

        --prefix PATH ":" "${jdk}/bin" \

        --prefix PATH ":" "${jdk_headless}/bin" \

        --prefix PATH ":" "${erlang}/bin"

    done

  '';

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -15635,7 +15635,9 @@ with pkgs; 














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



























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













  mercury = callPackage ../development/compilers/mercury {













    jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731













  };





























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