Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nix build #1047

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Fix nix build #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions c2rust-ast-exporter/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,16 @@ fn build_native(llvm_info: &LLVMInfo) {
// Build libclangAstExporter.a with cmake
let dst = Config::new("src")
// Where to find LLVM/Clang CMake files
.define("LLVM_DIR", &format!("{}/cmake/llvm", llvm_lib_dir))
.define("Clang_DIR", &format!("{}/cmake/clang", llvm_lib_dir))
.define(
"LLVM_DIR",
&env::var("CMAKE_LLVM_DIR")
.unwrap_or_else(|_| format!("{}/cmake/llvm", llvm_lib_dir)),
)
.define(
"Clang_DIR",
&env::var("CMAKE_CLANG_DIR")
.unwrap_or_else(|_| format!("{}/cmake/clang", llvm_lib_dir)),
)
// What to build
.build_target("clangAstExporter")
.build();
Expand Down
7 changes: 5 additions & 2 deletions shell.nix → default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let
nixpkgs = import <nixpkgs> {};
nixpkgs = import <nixpkgs> { };
inherit (nixpkgs) pkgs llvmPackages;
stdenv = pkgs.clangStdenv;
in
Expand All @@ -9,11 +9,14 @@ stdenv.mkDerivation {
pkgs.clang
pkgs.cmake
pkgs.llvm
pkgs.libllvm
pkgs.openssl
pkgs.pkgconfig
pkgs.python3
pkgs.rustup
pkgs.zlib
];
LIBCLANG_PATH="${llvmPackages.libclang}/lib";
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
CMAKE_LLVM_DIR = "${llvmPackages.libllvm.dev}/lib/cmake/llvm";
CMAKE_CLANG_DIR = "${llvmPackages.libclang.dev}/lib/cmake/clang";
}