Skip to content

fix(nix): resolve flake warnings, dedupe nixpkgs input, and refresh lockfile #552

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
YuriNek0 wants to merge 1 commit into
base: linux/rust
Choose a base branch
from
+34 −39
Open

fix(nix): resolve flake warnings, dedupe nixpkgs input, and refresh lockfile #552

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
50 changes: 18 additions & 32 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.

23 changes: 16 additions & 7 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
flake-parts.url = "github:hercules-ci/flake-parts";
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
systems.url = "github:nix-systems/default";
treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
};

outputs =
Expand All @@ -32,6 +35,11 @@
...
}:
let
libX11 = pkgs.libX11 or pkgs.xorg.libX11;
libXcursor = pkgs.libXcursor or pkgs.xorg.libXcursor;
libXi = pkgs.libXi or pkgs.xorg.libXi;
libXrandr = pkgs.libXrandr or pkgs.xorg.libXrandr;

buildInputs =
with pkgs;
[
Expand All @@ -47,10 +55,10 @@
freetype.dev
libGL
pkg-config
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
libX11
libXcursor
libXi
libXrandr
wayland
libxkbcommon
vulkan-loader
Expand Down Expand Up @@ -115,6 +123,7 @@
apps.default = {
type = "app";
program = lib.getExe librepods;
meta.description = "AirPods liberated from Apple's ecosystem";
};

devShells.default = craneLib.devShell {
Expand All @@ -133,8 +142,8 @@
};

treefmt = {
programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt-rfc-style.compiler;
programs.nixfmt.package = pkgs.nixfmt-rfc-style;
programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt;
programs.nixfmt.package = pkgs.nixfmt;
};
};
};
Expand Down