mercury: move to by-name (#492714)
This commit is contained in:
+3
-3
@@ -6,7 +6,7 @@
|
||||
flex,
|
||||
bison,
|
||||
texinfo,
|
||||
jdk_headless,
|
||||
openjdk8_headless,
|
||||
erlang,
|
||||
makeWrapper,
|
||||
readline,
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
flex
|
||||
bison
|
||||
texinfo
|
||||
jdk_headless
|
||||
openjdk8_headless
|
||||
erlang
|
||||
readline
|
||||
];
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
for e in $(ls $out/bin) ; do
|
||||
wrapProgram $out/bin/$e \
|
||||
--prefix PATH ":" "${gcc}/bin" \
|
||||
--prefix PATH ":" "${jdk_headless}/bin" \
|
||||
--prefix PATH ":" "${openjdk8_headless}/bin" \
|
||||
--prefix PATH ":" "${erlang}/bin"
|
||||
done
|
||||
'';
|
||||
@@ -4527,10 +4527,6 @@ with pkgs;
|
||||
mkLLVMPackages
|
||||
;
|
||||
|
||||
mercury = callPackage ../development/compilers/mercury {
|
||||
jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
||||
mitschemeX11 = mitscheme.override {
|
||||
enableX11 = true;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user