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

adding a lot of basic stuff for installation as a real app

Browse source
This commit is contained in:
Chris Cochrun 2022-10-21 14:58:33 -05:00
parent 642d7f2d82
commit 8da2a39a16
6 changed files with 53 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -57,3 +57,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(src) add_subdirectory(src)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novender librepresenter.desktop)

84
default.nix
View file

@ -1,34 +1,36 @@
{ pkgs ? import <nixpkgs> { } }: # { pkgs ? import <nixpkgs> { } }:
with pkgs; # with pkgs;
# { {
# stdenv, stdenv,
# lib, lib,
# # kglobalaccel, # kglobalaccel,
# # kinit, # kinit,
# # kwin, # kwin,
# # kio, # kio,
# # kguiaddons, # kguiaddons,
# # kcoreaddons, # kcoreaddons,
# gcc, gcc,
# gnumake, gnumake,
# clang, clang,
# cmake, cmake,
# extra-cmake-modules, extra-cmake-modules,
# pkg-config, pkg-config,
# wrapQtAppsHook, wrapQtAppsHook,
# qtbase, qtbase,
# qt5Full, qt5Full,
# clang-tools, clang-tools,
# qttools, qttools,
# qtquickcontrols2, qtquickcontrols2,
# qtx11extras, qtx11extras,
# qtmultimedia, qtmultimedia,
# kirigami2, karchive,
# ki18n, kirigami2,
# kcoreaddons, ki18n,
# # lightly-qt, kcoreaddons,
# mpv # lightly-qt,
# }: podofo,
mpv
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "Libre Presenter"; name = "Libre Presenter";
@ -45,25 +47,25 @@ stdenv.mkDerivation rec {
cmake cmake
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
libsForQt5.wrapQtAppsHook wrapQtAppsHook
# gccStdenv # gccStdenv
# stdenv # stdenv
]; ];
buildInputs = [ buildInputs = [
libsForQt5.qt5.full qtbase
libsForQt5.qttools qttools
libsForQt5.qtquickcontrols2 qtquickcontrols2
libsForQt5.qtx11extras qtx11extras
libsForQt5.qtmultimedia qtmultimedia
# qtwayland # qtwayland
libsForQt5.kirigami2 kirigami2
# breeze-icons # breeze-icons
# breeze-qt5 # breeze-qt5
# qqc2-desktop-style # qqc2-desktop-style
libsForQt5.karchive karchive
libsForQt5.ki18n ki18n
libsForQt5.kcoreaddons kcoreaddons
# lightly-qt # lightly-qt
podofo podofo
mpv mpv

2
flake.nix
View file

@ -15,7 +15,7 @@
in in
{ {
devShell = import ./shell.nix { inherit pkgs; }; devShell = import ./shell.nix { inherit pkgs; };
defaultPackage = import ./default.nix {inherit pkgs;}; defaultPackage = pkgs.libsForQt5.callPackage ./default.nix {};
} }
); );
} }

4
librepresenter.desktop Normal file
View file

@ -0,0 +1,4 @@
[Desktop Entry]
Exec=presenter
Name=Libre Presenter
Type=Application

4
shell.nix
View file

@ -7,7 +7,7 @@ mkShell rec {
gcc gcc
gnumake gnumake
clang clang
clang-tools # clang-tools
qtcreator qtcreator
cmake cmake
extra-cmake-modules extra-cmake-modules
@ -38,7 +38,7 @@ mkShell rec {
# This is only here because apparently it doesn't pick up the icon theme from the base system # This is only here because apparently it doesn't pick up the icon theme from the base system
# papirus-icon-theme # papirus-icon-theme
# lightly-qt lightly-qt
podofo podofo
mpv mpv

1
src/qml/presenter/MainWindow.qml
View file

@ -20,7 +20,6 @@ Controls.Page {
property int totalServiceItems property int totalServiceItems
/* property var video */ /* property var video */
property int dragItemIndex property int dragItemIndex
property string dragItemTitle: "" property string dragItemTitle: ""
property string dragItemType: "" property string dragItemType: ""