making default.nix work

This commit is contained in:
Chris Cochrun 2022-09-23 05:41:50 -05:00
parent 5713f40208
commit f32c92c0ce
3 changed files with 53 additions and 49 deletions

View file

@ -1,32 +1,34 @@
{ { pkgs ? import <nixpkgs> { } }:
stdenv, with pkgs;
lib, # {
# kglobalaccel, # stdenv,
# kinit, # lib,
# kwin, # # kglobalaccel,
# kio, # # kinit,
# kguiaddons, # # 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, # kcoreaddons,
gcc, # # lightly-qt,
gnumake, # mpv
clang, # }:
cmake,
extra-cmake-modules,
pkg-config,
wrapQtAppsHook,
qtbase,
qt5Full,
clang-tools,
qttools,
qtquickcontrols2,
qtx11extras,
qtmultimedia,
kirigami2,
ki18n,
kcoreaddons,
# lightly-qt,
mpv
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "Libre Presenter"; name = "Libre Presenter";
@ -39,28 +41,28 @@ stdenv.mkDerivation rec {
gcc gcc
gnumake gnumake
clang clang
clang-tools
cmake cmake
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
wrapQtAppsHook libsForQt5.wrapQtAppsHook
# gccStdenv # gccStdenv
# stdenv # stdenv
]; ];
buildInputs = [ buildInputs = [
clang-tools libsForQt5.qt5.full
qt5Full libsForQt5.qttools
qttools libsForQt5.qtquickcontrols2
qtquickcontrols2 libsForQt5.qtx11extras
qtx11extras libsForQt5.qtmultimedia
qtmultimedia
# qtwayland # qtwayland
kirigami2 libsForQt5.kirigami2
# breeze-icons # breeze-icons
# breeze-qt5 # breeze-qt5
# qqc2-desktop-style # qqc2-desktop-style
ki18n libsForQt5.ki18n
kcoreaddons libsForQt5.kcoreaddons
# lightly-qt # lightly-qt
mpv mpv
# libsForQt5.kconfig # libsForQt5.kconfig
@ -96,10 +98,10 @@ stdenv.mkDerivation rec {
rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/ rm -rf ~/.cache/librepresenter/Libre\ Presenter/qmlcache/
''; '';
# installPhase = '' installPhase = ''
# mkdir -p $out/bin mkdir -p $out/bin
# mv presenter $out/bin mv build/bin/presenter $out/bin
# ''; '';
meta = with lib; { meta = with lib; {
name = "Libre Presenter"; name = "Libre Presenter";

View file

@ -1,8 +1,10 @@
{ {
description = "A Church Presentation Application"; description = "A Church Presentation Application";
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs = {
inputs.flake-utils.url = "github:numtide/flake-utils"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }: outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem flake-utils.lib.eachDefaultSystem
@ -10,7 +12,7 @@
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
src = ./.; src = ./.;
in rec in
{ {
devShell = import ./shell.nix { inherit pkgs; }; devShell = import ./shell.nix { inherit pkgs; };
defaultPackage = import ./default.nix {inherit pkgs;}; defaultPackage = import ./default.nix {inherit pkgs;};

View file

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