diff options
Diffstat (limited to '')
| -rw-r--r-- | packages.nix | 14 | ||||
| -rw-r--r-- | packages/sidekick-dashboard/pkg.nix | 48 |
2 files changed, 23 insertions, 39 deletions
diff --git a/packages.nix b/packages.nix index fc045bd..67f6155 100644 --- a/packages.nix +++ b/packages.nix @@ -32,7 +32,6 @@ let nodejs-16_x # godot - # blender bspwm sxhkd @@ -52,6 +51,7 @@ let # Browser qutebrowser brave + # firefox # ungoogled-chromium # Comm @@ -69,9 +69,11 @@ let feh obs-studio inkscape + krita + # blender # Gaming - chiaki + # chiaki # Scheduling remind @@ -87,6 +89,13 @@ let gotop tremc zathura + # (emojipick.override { + # dmenu = localPkgs.dmenu; + # python3 = python3; + # emojipick-print-emoji = false; + # emojipick-font-family = "JetBrainsMono Nerd Font"; + # emojipick-font-size = "12"; + # }) ]; utils = with pkgs; [ @@ -107,6 +116,7 @@ let mediainfo poppler_utils glow + wineWowPackages.stable # appimage-run # Audio diff --git a/packages/sidekick-dashboard/pkg.nix b/packages/sidekick-dashboard/pkg.nix index 0835db6..7721a00 100644 --- a/packages/sidekick-dashboard/pkg.nix +++ b/packages/sidekick-dashboard/pkg.nix @@ -2,45 +2,19 @@ with pkgs.lib; let - useFakeHash = false; - commitHash = "f160ec9742cacd14f8853ea6d17dc4011f85156d"; - realSha256 = "sha256-LCFcX23dY7tFoXPgEHaD+U6g2X/9M4aE4TPfvhu6bLI="; + commitHash = "main"; - src = fetchFromGitHub { - owner = "mozilla"; - repo = "nixpkgs-mozilla"; - rev = "15b7a05f20aab51c4ffbefddb1b448e862dccb7d"; # 10th April 2022 - sha256 = "sha256-YeN4bpPvHkVOpQzb8APTAfE7/R+MFMwJUMkqmfvytSk="; - }; - moz = import "${src.out}/rust-overlay.nix" pkgs pkgs; - rust = moz.latest.rustChannels.nightly.rust.override { - extensions = [ "rust-src" ]; - }; -in -rustPlatform.buildRustPackage rec { - pname = "sidekick-dashboard"; - version = "0.0.0"; - - src = pkgs.fetchFromGitHub { + sidekickSrc = pkgs.fetchFromGitHub { owner = "phenax"; repo = "sidekick-dashboard"; - rev = commitHash; - sha256 = - if useFakeHash - then lib.fakeSha256 - else realSha256; + rev = "main"; + # sha256 = lib.fakeSha256; + sha256 = "sha256-1EJv0N1Ebp5vHN2+xETx4qhPQTS4YI6r3ysCkn0GozY="; }; - cargoSha256 = "sha256-dgW2SlpKovw79wkdGcbVm6c8KqkbcZlvZCwCcdVBShw="; - - nativeBuildInputs = with pkgs; [ cmake wrapQtAppsHook clang ]; - buildInputs = with pkgs; [ - pkg-config - libclang - libGL - qt5.full - qtbase - libsForQt5.qmake - makeWrapper - ]; -} + sidekickPkg = import "${sidekickSrc.out}/default.nix" { + inherit pkgs; + sourceRoot = replaceStrings [ "/nix/store/" ] [ "" ] "${sidekickSrc.out}"; + }; +in +sidekickPkg |