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

authored by Aleksana and committed by GitHub 7f75fa3b ad899942

+15 -2
+13
pkgs/development/compilers/armips/default.nix pkgs/by-name/ar/armips/package.nix
··· 16 sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA="; 17 }; 18 19 nativeBuildInputs = [ cmake ]; 20 21 installPhase = '' ··· 25 cp armips $out/bin 26 27 runHook postInstall 28 ''; 29 30 meta = with lib; {
··· 16 sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA="; 17 }; 18 19 + postPatch = '' 20 + substituteInPlace CMakeLists.txt \ 21 + --replace-fail c++11 c++17 22 + ''; 23 + 24 nativeBuildInputs = [ cmake ]; 25 26 installPhase = '' ··· 30 cp armips $out/bin 31 32 runHook postInstall 33 + ''; 34 + 35 + doCheck = true; 36 + 37 + checkPhase = '' 38 + runHook preCheck 39 + ./armipstests .. 40 + runHook postCheck 41 ''; 42 43 meta = with lib; {
+2 -2
pkgs/top-level/all-packages.nix
··· 4845 jdk = jdk8; 4846 }; 4847 4848 - armips = callPackage ../development/compilers/armips { 4849 - stdenv = gcc10Stdenv; 4850 }; 4851 4852 ballerina = callPackage ../development/compilers/ballerina {
··· 4845 jdk = jdk8; 4846 }; 4847 4848 + armips = callPackage ../by-name/ar/armips/package.nix { 4849 + stdenv = clangStdenv; 4850 }; 4851 4852 ballerina = callPackage ../development/compilers/ballerina {