Unverified Commit bfe49b65 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

mercury: move to by-name (#492714)

parents a6c3f17e b021b23f

pkgs/development/compilers/mercury/default.nix→pkgs/by-name/me/mercury/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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

  '';

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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;

  };