fixing herc, one moment

This commit is contained in:
Quinn Dougherty 2022-08-17 20:47:06 -07:00
parent 6f50501b05
commit 8e2bc13e25
2 changed files with 4 additions and 4 deletions

View File

@ -92,7 +92,7 @@
# ci
herc = let
hciSystem = "x86_64-linux";
hciPkgs = import nixpkgs { system = hciSystem; };
hciPkgs = import nixpkgs { system = hciSystem; overlays = overlays; };
effects = hercules-ci-effects.lib.withPkgs hciPkgs;
mc = mcFn hciPkgs;
lang = langFn hciPkgs;

View File

@ -1,8 +1,8 @@
{ pkgs }:
with pkgs.rustPlatform; rec {
rec {
rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
pkg = buildRustPackage {
pkg = pkgs.rustPlatform.buildRustPackage {
pname = "quri_squiggle_mc";
version = "0.0.1";
src = ../packages/mc;
@ -35,7 +35,7 @@ with pkgs.rustPlatform; rec {
test = pkgs.stdenv.mkDerivation {
name = "squiggle-mc-test";
src = mc-pkg + "/pkg";
src = pkg + "/pkg";
buildInputs = with pkgs; [ cargo ];
buildPhase = "cargo test";
installPhase = "mkdir -p $out";