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

60
default.nix
View file

@ -1,32 +1,32 @@
{ pkgs ? import <nixpkgs> { } }: {pkgs ? import <nixpkgs> {}}: let
let manifest = (pkgs.lib.importTOML ./Cargo.toml).package; manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
packages = with pkgs; [ packages = with pkgs; [
pkg-config pkg-config
libGLU libGLU
libGL libGL
libxkbcommon libxkbcommon
wayland wayland
]; ];
in in
pkgs.rustPlatform.buildRustPackage rec { pkgs.rustPlatform.buildRustPackage {
pname = manifest.name; pname = manifest.name;
version = manifest.version; version = manifest.version;
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
src = pkgs.lib.cleanSource ./.; src = pkgs.lib.cleanSource ./.;
meta = { meta = {
description = manifest.description ? null; description = manifest.description ? null;
}; };
postBuild = '' postBuild = ''
patchelf --add-needed libxkbcommon.so target/x86_64-unknown-linux-gnu/release/todoodoo patchelf --add-needed libxkbcommon.so target/x86_64-unknown-linux-gnu/release/todoodoo
patchelf --add-needed libwayland-client.so target/x86_64-unknown-linux-gnu/release/todoodoo patchelf --add-needed libwayland-client.so target/x86_64-unknown-linux-gnu/release/todoodoo
patchelf --add-needed libGLU.so target/x86_64-unknown-linux-gnu/release/todoodoo patchelf --add-needed libGLU.so target/x86_64-unknown-linux-gnu/release/todoodoo
patchelf --add-needed libEGL.so target/x86_64-unknown-linux-gnu/release/todoodoo patchelf --add-needed libEGL.so target/x86_64-unknown-linux-gnu/release/todoodoo
old_rpath=$(patchelf --print-rpath target/x86_64-unknown-linux-gnu/release/todoodoo) old_rpath=$(patchelf --print-rpath target/x86_64-unknown-linux-gnu/release/todoodoo)
if [[ -z "$old_rpath" ]]; then if [[ -z "$old_rpath" ]]; then
patchelf --set-rpath "${pkgs.lib.makeLibraryPath packages}" target/x86_64-unknown-linux-gnu/release/todoodoo patchelf --set-rpath "${pkgs.lib.makeLibraryPath packages}" target/x86_64-unknown-linux-gnu/release/todoodoo
else else
patchelf --set-rpath "${pkgs.lib.makeLibraryPath packages}:$old_rpath" target/x86_64-unknown-linux-gnu/release/todoodoo patchelf --set-rpath "${pkgs.lib.makeLibraryPath packages}:$old_rpath" target/x86_64-unknown-linux-gnu/release/todoodoo
fi fi
''; '';
} }

30
flake.nix
View file

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

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