first attempt at making nix build work

This commit is contained in:
Chris Cochrun 2022-09-22 15:06:52 -05:00
parent 31d668b1e3
commit ff4c301325
4 changed files with 30 additions and 9 deletions

View file

@ -1,15 +1,12 @@
{
stdenv,
lib,
# qtx11extras,
# qttools,
# kglobalaccel,
# kinit,
# kwin,
# kio,
# kguiaddons,
# kcoreaddons,
# systemsettings,
gcc,
gnumake,
clang,
@ -32,8 +29,11 @@
}:
stdenv.mkDerivation rec {
pname = "Libre Presenter";
name = "Libre Presenter";
version = "0.0.0";
# inherit src;
src = ./.;
nativeBuildInputs = [
gcc
@ -54,7 +54,11 @@ stdenv.mkDerivation rec {
qtquickcontrols2
qtx11extras
qtmultimedia
# qtwayland
kirigami2
# breeze-icons
# breeze-qt5
# qqc2-desktop-style
ki18n
kcoreaddons
# lightly-qt
@ -83,6 +87,20 @@ stdenv.mkDerivation rec {
# '';
configurePhase = ''
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ .
'';
buildPhase = ''
make --dir build/
rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/
'';
# installPhase = ''
# mkdir -p $out/bin
# mv presenter $out/bin
# '';
meta = with lib; {
name = "Libre Presenter";
description = "A church presentation software made with QT/QML";

View file

@ -7,10 +7,13 @@
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem
(system:
let pkgs = nixpkgs.legacyPackages.${system}; in
let
pkgs = nixpkgs.legacyPackages.${system};
src = ./.;
in
{
devShell = import ./shell.nix { inherit pkgs; };
defaultPackage = import ./default.nix { inherit pkgs; };
defaultPackage.x86_64-linux = import ./default.nix { inherit pkgs; };
}
);
}

View file

@ -6,8 +6,8 @@ mkShell rec {
nativeBuildInputs = [
gcc
gnumake
clang
clang-tools
clang_14
clang-tools_14
cmake
extra-cmake-modules
pkg-config

View file

@ -106,7 +106,7 @@ int main(int argc, char *argv[])
qmlRegisterType<SongSqlModel>("org.presenter", 1, 0, "SongSqlModel");
qmlRegisterType<VideoSqlModel>("org.presenter", 1, 0, "VideoSqlModel");
qmlRegisterType<ImageSqlModel>("org.presenter", 1, 0, "ImageSqlModel");
// qmlRegisterType<PresSqlModel>("org.presenter", 1, 0, "PresSqlModel");
qmlRegisterType<PresSqlModel>("org.presenter", 1, 0, "PresSqlModel");
qmlRegisterType<ServiceItemModel>("org.presenter", 1, 0, "ServiceItemModel");
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slide.get());