chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removing things and moving back to nix

Browse source
This commit is contained in:
Chris Cochrun 2023-07-08 21:45:01 -05:00
parent 434f3f1776
commit 3f00cf7abd
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.envrc
View file

@ -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

15
build.rs
View file

@ -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();
}