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

IDK!

Browse source
This commit is contained in:
Chris Cochrun 2023-07-05 09:33:03 -05:00
parent 9832e0df3d
commit 434f3f1776
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.envrc
View file

@ -4,5 +4,9 @@ export CMAKE_EXPORT_COMPILE_COMMANDS=1
export CMAKE_BUILD_TYPE=Debug export CMAKE_BUILD_TYPE=Debug
export CXX=g++ export CXX=g++
export CC=gcc export CC=gcc
export CXXQT_INCLUDE_PATH=$GUIX_ENVIRONMENT/include
export INCLUDEPATH="/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include"
# use flake . --impure # use flake . --impure
# eval $(guix shell -D --search-paths) eval $(guix shell -D --search-paths)
# use guix --development -f guix.scm

12
build.rs
View file

@ -1,7 +1,12 @@
use cxx_qt_build::CxxQtBuilder; use cxx_qt_build::CxxQtBuilder;
use std::env; use std::env;
use std::path::{Path, PathBuf};
fn main() { 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() CxxQtBuilder::new()
.file("src/rust/service_thing.rs") .file("src/rust/service_thing.rs")
.file("src/rust/settings.rs") .file("src/rust/settings.rs")
@ -14,5 +19,12 @@ fn main() {
.file("src/rust/presentation_model.rs") .file("src/rust/presentation_model.rs")
.file("src/rust/song_model.rs") .file("src/rust/song_model.rs")
.file("src/rust/ytdl.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");
})
.build(); .build();
} }

7
guix.scm
View file

@ -29,6 +29,7 @@
(guix gexp) (guix gexp)
(guix packages) (guix packages)
(guix git-download) (guix git-download)
(guix build-system qt)
(guix build-system cmake) (guix build-system cmake)
((guix licenses) #:prefix license:)) ((guix licenses) #:prefix license:))
@ -106,12 +107,12 @@
(name "lumina") (name "lumina")
(version "0.0.1") (version "0.0.1")
(source source) (source source)
(build-system cmake-build-system) (build-system qt-build-system)
(arguments `(#:phases (arguments `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'build (replace 'build
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "sh" "./build.sh" "-d")))))) (invoke "/bin/sh" "./build.sh" "-d"))))))
(inputs (list mpv (inputs (list mpv
ffmpeg)) ffmpeg))
@ -120,6 +121,7 @@
mold mold
clazy clazy
clang-toolchain clang-toolchain
mold
gdb gdb
pkg-config pkg-config
qtbase-5 qtbase-5
@ -139,6 +141,7 @@
;; corrosion is needed for build and is yet to ;; corrosion is needed for build and is yet to
;; be packaged. ;; be packaged.
corrosion corrosion
`(,rust "out") `(,rust "out")
`(,rust "rustfmt") `(,rust "rustfmt")
`(,rust "cargo") `(,rust "cargo")