Skip to content

flake: update and fix compilation #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cynerd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

flake: update and fix compilation #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 7 additions & 25 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

109 changes: 49 additions & 60 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,56 @@

outputs = {
self,
flake-utils,
systems,
nixpkgs,
}:
with builtins;
with flake-utils.lib;
with nixpkgs.lib; let
packages = pkgs:
with pkgs;
with qt6Packages; rec {
shvapp = stdenv.mkDerivation {
name = "shvapp";
src = builtins.path {
name = "shvapp-src";
path = ./.;
filter = path: type: ! hasSuffix ".nix" path;
};
outputs = ["out" "dev"];
buildInputs = [
wrapQtAppsHook
qtbase
qtmqtt
qtquick3d
qtserialport
qtsvg
qtwebsockets
libxkbcommon
doctest
lua5_3
];
nativeBuildInputs = [
cmake
];
};
default = shvapp;
};
in
{
nixosModules = import ./nixos/modules self.overlays.default;
overlays = {
shvapp = final: prev: packages (id prev);
default = self.overlays.shvapp;
};
}
// eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system}.extend self.overlays.default;
in {
packages = filterPackages system rec {
inherit (pkgs) shvapp;
default = shvapp;
};
legacyPackages = pkgs;
}: let
inherit (nixpkgs.lib) genAttrs;
forSystems = genAttrs (import systems);
withPkgs = func: forSystems (system: func self.legacyPackages.${system});
rev = self.shortRev or self.dirtyShortRev or "unknown";

# NixOS tests work only on Linux and we target Linux only anyway.
checks =
optionalAttrs (hasSuffix "-linux" system)
(import ./nixos/tests
nixpkgs.lib
self.legacyPackages.${system}
self.nixosModules)
// {inherit (self.packages.${system}) default;};
package = {
stdenv,
qt6Packages,
libxkbcommon,
doctest,
lua5_3,
cmake,
}:
stdenv.mkDerivation {
name = "shvapp-${rev}";
src = ./.;
outputs = ["out" "dev"];
buildInputs = [
qt6Packages.wrapQtAppsHook
qt6Packages.qtbase
qt6Packages.qtmqtt
qt6Packages.qtnetworkauth
qt6Packages.qtquick3d
qt6Packages.qtserialport
qt6Packages.qtsvg
qt6Packages.qtwebsockets
libxkbcommon
doctest
lua5_3
];
nativeBuildInputs = [
cmake
qt6Packages.qttools
];
};
in {
nixosModules = import ./nixos/modules self.overlays.default;
overlays.default = final: _: {
shvapp = final.callPackage package {};
};

formatter = pkgs.alejandra;
});
packages = withPkgs (pkgs: {default = pkgs.shvapp;});

legacyPackages =
forSystems (system:
nixpkgs.legacyPackages.${system}.extend self.overlays.default);

formatter = withPkgs (pkgs: pkgs.alejandra);
};
}