From 0e651e2d4e3691d1e5836b6234b44f25591e6d34 Mon Sep 17 00:00:00 2001 From: 8roken <211849604+8roken@users.noreply.github.com> Date: Wed, 28 May 2025 08:01:24 -0400 Subject: [PATCH] fix(nix): Simplify nix flake and fix dependencies Could get the project running by removing most of the hard-coded values and replace them with simplified directives. This new flake incantation should also be easier to maintain in the future. --- flake.lock | 185 +++++------------------------------------------------ flake.nix | 91 ++++++++------------------ 2 files changed, 42 insertions(+), 234 deletions(-) diff --git a/flake.lock b/flake.lock index 4666ccf..036f5f8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,123 +1,12 @@ { "nodes": { - "crane": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1687310026, - "narHash": "sha256-20RHFbrnC+hsG4Hyeg/58LvQAK7JWfFItTPFAFamu8E=", - "owner": "ipetkov", - "repo": "crane", - "rev": "116b32c30b5ff28e49f4fcbeeb1bbe3544593204", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1687760804, - "narHash": "sha256-4aJlNuAI+AjrUid9hmjdqwJxT7y/HCHptC2dtDmuEWU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "2102665784dba3f11314e37b4027794ccd324f1d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1687701825, - "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=", + "lastModified": 1748248602, + "narHash": "sha256-LanRAm0IRpL36KpCKSknEwkBFvTLc9mDHKeAmfTrHwg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea", + "rev": "ad331efcaf680eb1c838cb339472399ea7b3cdab", "type": "github" }, "original": { @@ -129,53 +18,8 @@ }, "root": { "inputs": { - "crane": "crane", - "fenix": "fenix", - "flake-utils": "flake-utils_2", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1687732103, - "narHash": "sha256-5Jn/Nj/xgcjTT289Itng55GLUBTEIULPndl/XrGkUwQ=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "4a2ceeff0fb53de168691b0f55d9808d221b867e", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "crane", - "flake-utils" - ], - "nixpkgs": [ - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685759304, - "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs": "nixpkgs", + "utils": "utils" } }, "systems": { @@ -193,18 +37,21 @@ "type": "github" } }, - "systems_2": { + "utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } } diff --git a/flake.nix b/flake.nix index e1508fc..b286fc3 100644 --- a/flake.nix +++ b/flake.nix @@ -3,46 +3,32 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - nix-filter.url = "github:numtide/nix-filter"; - crane = { - url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils, nix-filter, crane, fenix }: - flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: + outputs = { self, nixpkgs, utils }: + utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: let - pkgs = nixpkgs.legacyPackages.${system}; - craneLib = crane.lib.${system}.overrideToolchain fenix.packages.${system}.stable.toolchain; - crateNameFromCargoToml = craneLib.crateNameFromCargoToml {cargoToml = ./app/Cargo.toml;}; - pkgDef = { - inherit (crateNameFromCargoToml) pname version; - src = nix-filter.lib.filter { - root = ./.; - include = [ - ./app - ./page - ./pages - ./Cargo.toml - ./Cargo.lock - ./i18n - ./i18n.toml - ./justfile - ./resources - ]; - }; + pkgs = import nixpkgs { inherit system; }; + + runtimeDependencies = with pkgs; [ + wayland + # libglvnd # For libEGL + vulkan-loader + ]; + + in { + devShells.default = with pkgs; mkShell rec { nativeBuildInputs = with pkgs; [ just pkg-config - autoPatchelfHook ]; + buildInputs = with pkgs; [ + clang + cargo + rustc + rustfmt systemdMinimal bashInteractive libxkbcommon @@ -53,40 +39,15 @@ desktop-file-utils stdenv.cc.cc.lib libinput - ]; - runtimeDependencies = with pkgs; [ - wayland - libglvnd # For libEGL + libpulseaudio.dev + pipewire.dev ]; - }; - cargoArtifacts = craneLib.buildDepsOnly pkgDef; - cosmic-settings= craneLib.buildPackage (pkgDef // { - inherit cargoArtifacts; - }); - in { - checks = { - inherit cosmic-settings; + RUST_SRC_PATH = rustPlatform.rustLibSrc; + RUSTFLAGS = "-C link-arg=-Wl,-rpath,${pkgs.lib.makeLibraryPath runtimeDependencies}"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs; }; - - apps.default = flake-utils.lib.mkApp { - drv = cosmic-settings; - }; - packages.default = cosmic-settings.overrideAttrs (oldAttrs: rec { - installPhase = '' - just prefix=$out install - ''; - }); - - devShells.default = pkgs.mkShell rec { - inputsFrom = builtins.attrValues self.checks.${system}; - LD_LIBRARY_PATH = pkgs.lib.strings.makeLibraryPath (builtins.concatMap (d: d.runtimeDependencies) inputsFrom); - }; - }); - - nixConfig = { - # Cache for the Rust toolchain in fenix - extra-substituters = [ "https://nix-community.cachix.org" ]; - extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; - }; + } + ); }