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

first attempt at making nix build work

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

26
default.nix
View file

@ -1,15 +1,12 @@
{ {
stdenv, stdenv,
lib, lib,
# qtx11extras,
# qttools,
# kglobalaccel, # kglobalaccel,
# kinit, # kinit,
# kwin, # kwin,
# kio, # kio,
# kguiaddons, # kguiaddons,
# kcoreaddons, # kcoreaddons,
# systemsettings,
gcc, gcc,
gnumake, gnumake,
clang, clang,
@ -32,8 +29,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "Libre Presenter"; name = "Libre Presenter";
version = "0.0.0"; version = "0.0.0";
# inherit src;
src = ./.;
nativeBuildInputs = [ nativeBuildInputs = [
gcc gcc
@ -54,7 +54,11 @@ stdenv.mkDerivation rec {
qtquickcontrols2 qtquickcontrols2
qtx11extras qtx11extras
qtmultimedia qtmultimedia
# qtwayland
kirigami2 kirigami2
# breeze-icons
# breeze-qt5
# qqc2-desktop-style
ki18n ki18n
kcoreaddons kcoreaddons
# lightly-qt # 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; { meta = with lib; {
name = "Libre Presenter"; name = "Libre Presenter";
description = "A church presentation software made with QT/QML"; description = "A church presentation software made with QT/QML";

7
flake.nix
View file

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

4
shell.nix
View file

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

2
src/main.cpp
View file

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