Compare commits

...

2 commits

Author SHA1 Message Date
Chris Cochrun
87bb586012 adding some things to env 2025-08-04 14:50:34 -05:00
Chris Cochrun
834b21b7d2 fix slidetypes 2025-08-04 14:49:54 -05:00
3 changed files with 5 additions and 1 deletions

1
.envrc
View file

@ -5,6 +5,7 @@ export CMAKE_BUILD_TYPE=Debug
export CXX=g++ export CXX=g++
export CC=gcc export CC=gcc
export DATABASE_URL=sqlite:///home/chris/.local/share/lumina/library-db.sqlite3 export DATABASE_URL=sqlite:///home/chris/.local/share/lumina/library-db.sqlite3
export QML_BUILD_DIRS=./bld/
# export CXXQT_INCLUDE_PATH=$GUIX_ENVIRONMENT/include # export CXXQT_INCLUDE_PATH=$GUIX_ENVIRONMENT/include
# export INCLUDEPATH="/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include" # export INCLUDEPATH="/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include"
use flake . --impure use flake . --impure

View file

@ -106,6 +106,7 @@
CMAKE_C_COMPILER = "${pkgs.gcc}/bin/gcc"; CMAKE_C_COMPILER = "${pkgs.gcc}/bin/gcc";
CMAKE_CXX_COMPILER = "${pkgs.gcc}/bin/g++"; CMAKE_CXX_COMPILER = "${pkgs.gcc}/bin/g++";
CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true; CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;
QML_IMPORT_PATH = "${pkgs.qt6.full}/lib/qt-6/:${pkgs.qt6.qtmultimedia}/lib/qt-6/:${pkgs.qt6.qtwebengine}/lib/qt-6/:${pkgs.qt6.qtimageformats}:${pkgs.kdePackages.kirigami}/lib/qt-6/";
# KDE_INCLUDEDIR = "${pkgs.kdePackages.kirigami}/include"; # KDE_INCLUDEDIR = "${pkgs.kdePackages.kirigami}/include";
# KDE_QMLDIR = "${pkgs.kdePackages.kirigami}/lib/qt-6/qml/"; # KDE_QMLDIR = "${pkgs.kdePackages.kirigami}/lib/qt-6/qml/";

View file

@ -66,7 +66,9 @@ impl From<SlideType> for String {
SlideType::Song => "song".to_owned(), SlideType::Song => "song".to_owned(),
SlideType::Video => "video".to_owned(), SlideType::Video => "video".to_owned(),
SlideType::Image => "image".to_owned(), SlideType::Image => "image".to_owned(),
SlideType::Presentation(_) => "presentation".to_owned(), SlideType::Presentation(PresType::Generic) => "presentation".to_owned(),
SlideType::Presentation(PresType::Html) => "html".to_owned(),
SlideType::Presentation(PresType::Pdf) => "pdf".to_owned(),
SlideType::Content => "content".to_owned(), SlideType::Content => "content".to_owned(),
} }
} }