cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
mercury: use jdk_headless to allow non-gui builds
This commit is contained in:
Adam Joseph 2023-04-24 04:43:16 +00:00 committed by GitHub
commit 6598663bd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/mercury/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper { lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk_headless, erlang, makeWrapper
, readline }: , readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gcc flex bison texinfo jdk erlang readline ]; buildInputs = [ gcc flex bison texinfo jdk_headless erlang readline ];
patchPhase = '' patchPhase = ''
# Fix calls to programs in /bin # Fix calls to programs in /bin
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
for e in $(ls $out/bin) ; do for e in $(ls $out/bin) ; do
wrapProgram $out/bin/$e \ wrapProgram $out/bin/$e \
--prefix PATH ":" "${gcc}/bin" \ --prefix PATH ":" "${gcc}/bin" \
--prefix PATH ":" "${jdk}/bin" \ --prefix PATH ":" "${jdk_headless}/bin" \
--prefix PATH ":" "${erlang}/bin" --prefix PATH ":" "${erlang}/bin"
done done
''; '';

4
pkgs/top-level/all-packages.nix
View file

@ -15635,7 +15635,9 @@ with pkgs;
marst = callPackage ../development/compilers/marst { }; 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 { }; microscheme = callPackage ../development/compilers/microscheme { };