From 3f00cf7abd5163aeb9c328e27284aa6c1beceae0 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 8 Jul 2023 21:45:01 -0500 Subject: [PATCH] removing things and moving back to nix --- .envrc | 8 ++++---- build.rs | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.envrc b/.envrc index d75f536..6d52b20 100644 --- a/.envrc +++ b/.envrc @@ -4,9 +4,9 @@ export CMAKE_EXPORT_COMPILE_COMMANDS=1 export CMAKE_BUILD_TYPE=Debug export CXX=g++ export CC=gcc -export CXXQT_INCLUDE_PATH=$GUIX_ENVIRONMENT/include -export INCLUDEPATH="/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include" -# use flake . --impure -eval $(guix shell -D --search-paths) +# export CXXQT_INCLUDE_PATH=$GUIX_ENVIRONMENT/include +# export INCLUDEPATH="/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include" +use flake . --impure +# eval $(guix shell -D --search-paths) # use guix --development -f guix.scm diff --git a/build.rs b/build.rs index 364aca6..65f1f08 100644 --- a/build.rs +++ b/build.rs @@ -5,7 +5,6 @@ use std::path::{Path, PathBuf}; fn main() { // let guix_profile_dir = env::var("GUIX_ENVIRONMENT").is_ok(); // println!("{}", guix_profile_dir); - println!("cargo:CXXBRIDGE_DIR6=include/qt5"); // let qt_include = PathBuf::from(guix_profile_dir).push("include").push("qt5"); CxxQtBuilder::new() .file("src/rust/service_thing.rs") @@ -19,12 +18,12 @@ fn main() { .file("src/rust/presentation_model.rs") .file("src/rust/song_model.rs") .file("src/rust/ytdl.rs") - .cc_builder(|cc| { - cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/QQmlApplicationEngine"); - cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/qqmlapplicationengine.h"); -cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/qqmlengine.h"); -cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/QQmlEngine"); -cc.include("include/qt5"); - }) + // .cc_builder(|cc| { + // cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/QQmlApplicationEngine"); + // cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/qqmlapplicationengine.h"); + // cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/qqmlengine.h"); + // cc.include("/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include/qt5/QtQml/QQmlEngine"); + // cc.include("include/qt5"); + // }) .build(); }