Unverified Commit 7f75fa3b authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

armips: build with Clang instead of GCC 10, run tests (#412719)

parents ad899942 d0c39b61

pkgs/development/compilers/armips/default.nix→pkgs/by-name/ar/armips/package.nix

+13 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA=";

  };



  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace-fail c++11 c++17

  '';



  nativeBuildInputs = [ cmake ];



  installPhase = ''
@@ -27,6 +32,14 @@ stdenv.mkDerivation rec { 
    runHook postInstall

  '';



  doCheck = true;



  checkPhase = ''

    runHook preCheck

    ./armipstests ..

    runHook postCheck

  '';



  meta = with lib; {

    homepage = "https://github.com/Kingcom/armips";

    description = "Assembler for various ARM and MIPS platforms";

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -4845,8 +4845,8 @@ with pkgs; 
    jdk = jdk8;

  };



  armips = callPackage ../development/compilers/armips {

    stdenv = gcc10Stdenv;

  armips = callPackage ../by-name/ar/armips/package.nix {

    stdenv = clangStdenv;

  };



  ballerina = callPackage ../development/compilers/ballerina {