diff --git a/flake.lock b/flake.lock index 6152e20c8..455aeed4b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1724974107, - "narHash": "sha256-69+1W0Ao5K9su569YUfUPANeN/Ea7aKu7xIZP1MSl9o=", + "lastModified": 1768319649, + "narHash": "sha256-VFkNyxHxkqGp8gf8kfFMW1j6XeBy609kv6TE9uF/0Js=", "owner": "ipetkov", "repo": "crane", - "rev": "63396562b8e08efda3b3c66e32661b8a513055de", + "rev": "4b6527687cfd20da3c2ef8287e01b74c2d6c705b", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "lastModified": 1757882181, + "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=", "owner": "numtide", "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "rev": "59c44d1909c72441144b93cf0f054be7fe764de5", "type": "github" }, "original": { @@ -32,11 +32,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725067332, - "narHash": "sha256-bMi5zhDwR6jdmN5mBHEu9gQQf9CibIEasA/6mc34Iek=", + "lastModified": 1768302833, + "narHash": "sha256-h5bRFy9bco+8QcK7rGoOiqMxMbmn21moTACofNLRMP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "192e7407cc66e2eccc3a6c5ad3834dd62fae3800", + "rev": "61db79b0c6b838d9894923920b612048e1201926", "type": "github" }, "original": { @@ -53,11 +53,11 @@ ] }, "locked": { - "lastModified": 1725024810, - "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1724984647, - "narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=", + "lastModified": 1768359079, + "narHash": "sha256-a016mOfKconYrYo3fZLN6c2cnmqYYd44g2bUrBZAsQc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4", + "rev": "0357d1826057686637e41147545402cbbda420ce", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1fe2c57c3..5cbe507b9 100644 --- a/flake.nix +++ b/flake.nix @@ -15,102 +15,99 @@ nix-filter.url = "github:numtide/nix-filter"; }; - outputs = - inputs@{ - self, - nixpkgs, - parts, - crane, - rust, - nix-filter, - ... - }: - parts.lib.mkFlake { inherit inputs; } { + outputs = inputs @ { + self, + nixpkgs, + parts, + crane, + rust, + nix-filter, + ... + }: + parts.lib.mkFlake {inherit inputs;} { systems = [ "aarch64-linux" "x86_64-linux" ]; - perSystem = - { - self', - lib, - system, - ... - }: - let - pkgs = nixpkgs.legacyPackages.${system}.extend rust.overlays.default; - rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; - craneLib = (crane.mkLib pkgs).overrideToolchain rust-toolchain; - craneArgs = { - pname = "cosmic-comp"; - version = self.rev or "dirty"; + perSystem = { + self', + lib, + system, + ... + }: let + pkgs = nixpkgs.legacyPackages.${system}.extend rust.overlays.default; + rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + craneLib = (crane.mkLib pkgs).overrideToolchain rust-toolchain; + craneArgs = { + pname = "cosmic-comp"; + version = self.rev or "dirty"; - src = nix-filter.lib.filter { - root = ./.; - include = [ - ./src - ./i18n.toml - ./Cargo.toml - ./Cargo.lock - ./resources - ./cosmic-comp-config - ]; - }; - - nativeBuildInputs = with pkgs; [ - pkg-config - autoPatchelfHook - cmake + src = nix-filter.lib.filter { + root = ./.; + include = [ + ./src + ./i18n.toml + ./Cargo.toml + ./Cargo.lock + ./resources + ./cosmic-comp-config ]; + }; - buildInputs = with pkgs; [ - wayland - systemd # For libudev - seatd # For libseat - libxkbcommon - libinput - mesa # For libgbm - fontconfig - stdenv.cc.cc.lib - pixman - libdisplay-info - ]; + nativeBuildInputs = with pkgs; [ + pkg-config + autoPatchelfHook + cmake + ]; - runtimeDependencies = with pkgs; [ - libglvnd # For libEGL - wayland # winit->wayland-sys wants to dlopen libwayland-egl.so - # for running in X11 - xorg.libX11 - xorg.libXcursor - xorg.libxcb - xorg.libXi - libxkbcommon - # for vulkan backend - vulkan-loader - ]; - }; + buildInputs = with pkgs; [ + wayland + systemd # For libudev + seatd # For libseat + libxkbcommon + libinput + mesa # For libgbm + libgbm + fontconfig + stdenv.cc.cc.lib + pixman + libdisplay-info + ]; - cargoArtifacts = craneLib.buildDepsOnly craneArgs; - cosmic-comp = craneLib.buildPackage (craneArgs // { inherit cargoArtifacts; }); - in - { - apps.cosmic-comp = { - type = "app"; - program = lib.getExe self'.packages.default; - }; + runtimeDependencies = with pkgs; [ + libglvnd # For libEGL + wayland # winit->wayland-sys wants to dlopen libwayland-egl.so + # for running in X11 + xorg.libX11 + xorg.libXcursor + xorg.libxcb + xorg.libXi + libxkbcommon + # for vulkan backend + vulkan-loader + ]; + }; - checks.cosmic-comp = cosmic-comp; - packages.default = cosmic-comp; + cargoArtifacts = craneLib.buildDepsOnly craneArgs; + cosmic-comp = craneLib.buildPackage (craneArgs // {inherit cargoArtifacts;}); + in { + apps.cosmic-comp = { + type = "app"; + program = lib.getExe self'.packages.default; + }; - devShells.default = craneLib.devShell { - LD_LIBRARY_PATH = lib.makeLibraryPath ( - __concatMap (d: d.runtimeDependencies) (__attrValues self'.checks) - ); + checks.cosmic-comp = cosmic-comp; + packages.default = cosmic-comp; - # include build inputs - inputsFrom = [ cosmic-comp ]; - }; + devShells.default = craneLib.devShell { + LD_LIBRARY_PATH = lib.makeLibraryPath ( + lib.concatMap (d: d.runtimeDependencies) (lib.attrValues self'.checks) + ); + + # include build inputs + inputsFrom = [cosmic-comp]; }; + }; }; }