diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-04-24 04:43:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-24 04:43:16 +0000 |
| commit | 6598663bd94976847203fdd9dc4d19230137024b (patch) | |
| tree | e4bd24f84ffab649867eb1b83967e06de1caf585 | |
| parent | d8409def044b76b312be4d83f21547bd49a36e54 (diff) | |
| parent | 8fbe036fb2bf56ac5f1195a1c68d7a1641931ddf (diff) | |
| download | nixpkgs-6598663bd94976847203fdd9dc4d19230137024b.tar nixpkgs-6598663bd94976847203fdd9dc4d19230137024b.tar.gz nixpkgs-6598663bd94976847203fdd9dc4d19230137024b.tar.bz2 nixpkgs-6598663bd94976847203fdd9dc4d19230137024b.tar.lz nixpkgs-6598663bd94976847203fdd9dc4d19230137024b.tar.xz nixpkgs-6598663bd94976847203fdd9dc4d19230137024b.tar.zst nixpkgs-6598663bd94976847203fdd9dc4d19230137024b.zip | |
Merge pull request #192192 from amjoseph-nixpkgs/pr/mercury/jdk_headless
mercury: use jdk_headless to allow non-gui builds
| -rw-r--r-- | pkgs/development/compilers/mercury/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 87c70dcb4aa..34c2f6bf6aa 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -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 }: 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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4557c4b7219..76656894c4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |