diff --git a/Cargo.toml b/Cargo.toml index 2ac50b4..a15e995 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,8 @@ serde = "1.0.152" serde_derive = "1.0.152" quote = "1.0.27" cxx = "1.0.83" -cxx-qt = "0.5.3" -cxx-qt-lib = "0.5.3" +cxx-qt = "0.5.2" +cxx-qt-lib = "0.5.2" # home = "0.5.4" dirs = "5.0.0" diesel = { version = "2.0.3", features = ["sqlite"] } @@ -32,7 +32,7 @@ youtube_dl = "0.8.0" # cxx-qt-build generates C++ code from the `#[cxx_qt::bridge]` module # and compiles it together with the Rust static library [build-dependencies] -cxx-qt-build = "0.5.3" +cxx-qt-build = "0.5.2" # [dependencies.confy] # features = ["yaml_conf"] diff --git a/guix.scm b/guix.scm new file mode 100644 index 0000000..8d3914e --- /dev/null +++ b/guix.scm @@ -0,0 +1,89 @@ + +(define-module (lumina) + #:use-module (gnu packages) + #:use-module (gnu packages rust-apps) + #:use-module (gnu services) + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public corrosion + (package + (name "corrosion") + (version (git-version "0.0.1" revision commit)) + (source (origin )) + (build-system cmake-build-system) + (arguments `(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (invoke "cmake" "")))))) + (inputs (list + clang + clang-toolchain + qtbase + qttools + qtquickcontrols2 + qtx11extras + qtwayland + qtwebengine + kirigami + qqc2-desktop-style + karchive + mpv + ffmpeg + rust + ;; both of these need to be packaged yet + ;; corrosion is needed for build... + ;; corrosion + ;; rust-rustfmt + rust-clippy + rust-cargo + rust-analyzer)) + (license license:gpl3+) + (home-page "idk") + (synopsis "A Church Presentation Application") + (description "idk") + )) + +(define-public lumina + ;; (let ((commit "62f19dba573b924703829847feb1bfee68885514") + ;; (revision "0")) + (package + (name "lumina") + (version (git-version "0.0.1" revision commit)) + (source source) + (build-system cmake-build-system) + (arguments `(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (invoke "cmake" "")))))) + (inputs (list + clang + clang-toolchain + qtbase + qttools + qtquickcontrols2 + qtx11extras + qtwayland + qtwebengine + kirigami + qqc2-desktop-style + karchive + mpv + ffmpeg + rust + ;; both of these need to be packaged yet + ;; corrosion is needed for build... + ;; corrosion + ;; rust-rustfmt + rust-clippy + rust-cargo + rust-analyzer)) + (license license:gpl3+) + (home-page "idk") + (synopsis "A Church Presentation Application") + (description "idk"))) diff --git a/shell.nix b/shell.nix index 1b84a9c..c804d1b 100644 --- a/shell.nix +++ b/shell.nix @@ -36,8 +36,7 @@ mkShell rec { libsForQt5.karchive # libsForQt5.kirigami-addons # libsForQt5.ki18n - libsForQt5.kcoreaddons - libsForQt5.sonnet + # libsForQt5.kcoreaddons # libsForQt5.kguiaddons # libsForQt5.kconfig @@ -59,9 +58,12 @@ mkShell rec { # lockFile = ./Cargo.lock; # }; - RUST_BACKTRACE = 1; + RUST_BACKTRACE = "full"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + CMAKE_C_COMPILER = "${gcc}/bin/gcc"; + CMAKE_CXX_COMPILER = "${gcc}/bin/g++"; # QT_SCALE_FACTOR = 1; + # This creates the proper qt env so that plugins are found right. shellHook = '' setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh)