timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ensure use of gcc/clang at stdenv level for checks

Browse source
This commit is contained in:
Faye Duxovni 2022-05-12 19:42:47 -04:00
parent e116efa752
commit 43672251e4
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -28,10 +28,10 @@
node_modules = pkgs.npmlock2nix.node_modules { src = ./javascript; };
in
rec {
checks.gcc-cmake = pkgs.stdenv.mkDerivation {
checks.gcc-cmake = pkgs.gccStdenv.mkDerivation {
name = "olm";
buildInputs = with pkgs; [ gcc cmake ];
buildInputs = [ pkgs.cmake ];
src = ./.;
@ -47,10 +47,10 @@
'';
};
checks.clang-cmake = pkgs.stdenv.mkDerivation {
checks.clang-cmake = pkgs.clangStdenv.mkDerivation {
name = "olm";
buildInputs = with pkgs; [ clang cmake ];
buildInputs = [ pkgs.cmake ];
src = ./.;
@ -66,11 +66,9 @@
'';
};
checks.gcc-make = pkgs.stdenv.mkDerivation {
checks.gcc-make = pkgs.gccStdenv.mkDerivation {
name = "olm";
buildInputs = with pkgs; [ gcc gnumake ];
src = ./.;
buildPhase = ''