toby/todoodoo
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: nix fmt

Browse source
This commit is contained in:
Tobias Berger 2024-02-05 21:27:19 +01:00
parent b9108c29b2
commit 1cc53fbfb6
Signed by: toby
GPG key ID: 2D05EFAB764D6A88
3 changed files with 62 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
default.nix
View file

@ -1,5 +1,5 @@
{ pkgs ? import <nixpkgs> { } }:
let manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
{pkgs ? import <nixpkgs> {}}: let
manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
packages = with pkgs; [
pkg-config
libGLU
@ -8,7 +8,7 @@ let manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
wayland
];
in
pkgs.rustPlatform.buildRustPackage rec {
pkgs.rustPlatform.buildRustPackage {
pname = manifest.name;
version = manifest.version;
cargoLock.lockFile = ./Cargo.lock;
@ -29,4 +29,4 @@ pkgs.rustPlatform.buildRustPackage rec {
patchelf --set-rpath "${pkgs.lib.makeLibraryPath packages}:$old_rpath" target/x86_64-unknown-linux-gnu/release/todoodoo
fi
'';
}
}

14
flake.nix
View file

@ -3,18 +3,20 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs = { self, nixpkgs }:
let
supportedSystems = [ "x86_64-linux" ];
outputs = {
self,
nixpkgs,
}: let
supportedSystems = ["x86_64-linux"];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
pkgsFor = nixpkgs.legacyPackages;
in {
formatter = forAllSystems (system: pkgsFor.${system}.alejandra);
packages = forAllSystems (system: {
default = pkgsFor.${system}.callPackage ./default.nix { };
default = pkgsFor.${system}.callPackage ./default.nix {};
});
devShells = forAllSystems (system: {
default = pkgsFor.${system}.callPackage ./shell.nix { };
default = pkgsFor.${system}.callPackage ./shell.nix {};
});
};
}

14
shell.nix
View file

@ -1,5 +1,8 @@
{ pkgs ? import <nixpkgs> { }, lib }:
let packages = with pkgs; [
{
pkgs ? import <nixpkgs> {},
lib,
}: let
packages = with pkgs; [
rust-analyzer
rustfmt
clippy
@ -16,14 +19,13 @@ let packages = with pkgs; [
wayland
];
in
pkgs.mkShell {
pkgs.mkShell {
# Get dependencies from the main package
inputsFrom = [ (pkgs.callPackage ./default.nix { }) ];
inputsFrom = [(pkgs.callPackage ./default.nix {})];
nativeBuildInputs = packages;
buildInputs = packages;
env = {
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
LD_LIBRARY_PATH = "${lib.makeLibraryPath packages}";
};
}
}