ensure use of gcc/clang at stdenv level for checks
This commit is contained in:
parent
e116efa752
commit
43672251e4
1 changed files with 5 additions and 7 deletions
12
flake.nix
12
flake.nix
|
@ -28,10 +28,10 @@
|
||||||
node_modules = pkgs.npmlock2nix.node_modules { src = ./javascript; };
|
node_modules = pkgs.npmlock2nix.node_modules { src = ./javascript; };
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
checks.gcc-cmake = pkgs.stdenv.mkDerivation {
|
checks.gcc-cmake = pkgs.gccStdenv.mkDerivation {
|
||||||
name = "olm";
|
name = "olm";
|
||||||
|
|
||||||
buildInputs = with pkgs; [ gcc cmake ];
|
buildInputs = [ pkgs.cmake ];
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
|
@ -47,10 +47,10 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
checks.clang-cmake = pkgs.stdenv.mkDerivation {
|
checks.clang-cmake = pkgs.clangStdenv.mkDerivation {
|
||||||
name = "olm";
|
name = "olm";
|
||||||
|
|
||||||
buildInputs = with pkgs; [ clang cmake ];
|
buildInputs = [ pkgs.cmake ];
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
|
@ -66,11 +66,9 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
checks.gcc-make = pkgs.stdenv.mkDerivation {
|
checks.gcc-make = pkgs.gccStdenv.mkDerivation {
|
||||||
name = "olm";
|
name = "olm";
|
||||||
|
|
||||||
buildInputs = with pkgs; [ gcc gnumake ];
|
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
Loading…
Reference in a new issue