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

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

View file

@ -57,3 +57,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(src)
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)

View file

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

View file

@ -15,7 +15,7 @@
in
{
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

View file

@ -7,7 +7,7 @@ mkShell rec {
gcc
gnumake
clang
clang-tools
# clang-tools
qtcreator
cmake
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
# papirus-icon-theme
# lightly-qt
lightly-qt
podofo
mpv

View file

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