diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d8fded..e2643d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/default.nix b/default.nix index b1a711c..a665270 100644 --- a/default.nix +++ b/default.nix @@ -1,34 +1,36 @@ -{ pkgs ? import { } }: -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 { } }: +# 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 diff --git a/flake.nix b/flake.nix index 8d27d44..ca2798a 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ in { devShell = import ./shell.nix { inherit pkgs; }; - defaultPackage = import ./default.nix {inherit pkgs;}; + defaultPackage = pkgs.libsForQt5.callPackage ./default.nix {}; } ); } diff --git a/librepresenter.desktop b/librepresenter.desktop new file mode 100644 index 0000000..d2edbaf --- /dev/null +++ b/librepresenter.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Exec=presenter +Name=Libre Presenter +Type=Application \ No newline at end of file diff --git a/shell.nix b/shell.nix index 63f315c..93a663f 100644 --- a/shell.nix +++ b/shell.nix @@ -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 diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index 736321f..38db968 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -20,7 +20,6 @@ Controls.Page { property int totalServiceItems /* property var video */ - property int dragItemIndex property string dragItemTitle: "" property string dragItemType: ""