From 423ef593def0f066d74af2673281e1850dcd5db7 Mon Sep 17 00:00:00 2001 From: Nickiel12 Date: Mon, 25 Mar 2024 17:43:21 -0700 Subject: [PATCH] got a working cargo build --- .gitignore | 3 +- flake.lock | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 6 ++-- 3 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 flake.lock diff --git a/.gitignore b/.gitignore index 491b041..0bd1d76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target -settings.toml \ No newline at end of file +settings.toml +.direnv/* diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..4515b15 --- /dev/null +++ b/flake.lock @@ -0,0 +1,96 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1711332768, + "narHash": "sha256-SFnlIwnrwJxEawLcrH7+zGb8spePcYyai5asMZnm0BM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8a8e3ea9a9a4b2225cb5e33e07c3a337f820168c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 2baf3dc..0d59b73 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ Some utility commands: */ { - description = ""; + description = "Joystick Controller client for the VCC motorized camera"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -34,8 +34,8 @@ Some utility commands: }; rustSettings = with pkgs; { src = ./.; - #nativeBuildInputs = [ pkg-config ]; - #buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl systemd gtk4 ]; cargoHash = nixpkgs.lib.fakeHash; }; meta = with nixpkgs.lib; {