From cb8b923f38b2b6e52d67b4b58c6fbd7b3ad04b81 Mon Sep 17 00:00:00 2001 From: "Emil J. Tywoniak" Date: Mon, 17 Jun 2024 10:53:41 +0200 Subject: [PATCH] =?UTF-8?q?nix:=20brokey=20for=20tom=C3=ADk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 404f29dc4..3b95066b5 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ yosys = pkgs.llvmPackages.libcxxStdenv.mkDerivation { name = "yosys"; src = ./. ; - buildInputs = with pkgs; [ bison flex libffi tcl readline python3 llvmPackages.libcxxClang zlib git pkg-configUpstream tracy ]; + buildInputs = with pkgs; [ bison flex libffi tcl readline python3 zlib git pkg-configUpstream tracy ]; checkInputs = with pkgs; [ gtest ]; propagatedBuildInputs = [ abc-verifier ]; preConfigure = "make config-clang"; @@ -41,8 +41,9 @@ in { packages.default = yosys; defaultPackage = yosys; - devShell = pkgs.mkShell { - buildInputs = with pkgs; [ clang bison flex libffi tcl readline python3 llvmPackages.libcxxClang zlib git gtest abc-verifier tracy ]; + devShell = pkgs.mkShell.override {stdenv = pkgs.llvmPackages.libcxxStdenv; } { + buildInputs = with pkgs; [ bison flex libffi tcl readline python3 zlib git pkg-configUpstream tracy ]; + propagatedBuildInputs = [ abc-verifier ]; }; } );