diff --git a/.envrc b/.envrc index f881ad2..a2fd1ef 100644 --- a/.envrc +++ b/.envrc @@ -5,7 +5,6 @@ export CMAKE_BUILD_TYPE=Debug export CXX=g++ export CC=gcc 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 INCLUDEPATH="/gnu/store/pkjvij1f6rvx42xv2kygicr7fsch41dl-profile/include" use flake . --impure diff --git a/flake.nix b/flake.nix index 66e73f3..8c30dfc 100644 --- a/flake.nix +++ b/flake.nix @@ -106,7 +106,6 @@ CMAKE_C_COMPILER = "${pkgs.gcc}/bin/gcc"; CMAKE_CXX_COMPILER = "${pkgs.gcc}/bin/g++"; 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_QMLDIR = "${pkgs.kdePackages.kirigami}/lib/qt-6/qml/"; diff --git a/src/rust/slide_types.rs b/src/rust/slide_types.rs index 476a91c..d413915 100644 --- a/src/rust/slide_types.rs +++ b/src/rust/slide_types.rs @@ -66,9 +66,7 @@ impl From for String { SlideType::Song => "song".to_owned(), SlideType::Video => "video".to_owned(), SlideType::Image => "image".to_owned(), - SlideType::Presentation(PresType::Generic) => "presentation".to_owned(), - SlideType::Presentation(PresType::Html) => "html".to_owned(), - SlideType::Presentation(PresType::Pdf) => "pdf".to_owned(), + SlideType::Presentation(_) => "presentation".to_owned(), SlideType::Content => "content".to_owned(), } }