leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update and fix flake.nix

Browse source
This commit is contained in:
Elias Graf 2024-08-31 11:28:11 +02:00 • committed by Victoria Brekenfeld
parent 971c28db38
commit f720a197e4
2 changed files with 18 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

69
flake.lock generated
View file

@ -1,17 +1,12 @@
{ {
"nodes": { "nodes": {
"crane": { "crane": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1699548976, "lastModified": 1724974107,
"narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", "narHash": "sha256-69+1W0Ao5K9su569YUfUPANeN/Ea7aKu7xIZP1MSl9o=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "6849911446e18e520970cc6b7a691e64ee90d649", "rev": "63396562b8e08efda3b3c66e32661b8a513055de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,31 +15,13 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nix-filter": { "nix-filter": {
"locked": { "locked": {
"lastModified": 1687178632, "lastModified": 1710156097,
"narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide", "owner": "numtide",
"repo": "nix-filter", "repo": "nix-filter",
"rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", "rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +32,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1685591878, "lastModified": 1725067332,
"narHash": "sha256-Ib3apaLqIFkZb94q6Q214DXrz0FnJq5C7usywTv63og=", "narHash": "sha256-bMi5zhDwR6jdmN5mBHEu9gQQf9CibIEasA/6mc34Iek=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8d4d822bc0efa9de6eddc79cb0d82897a9baa750", "rev": "192e7407cc66e2eccc3a6c5ad3834dd62fae3800",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,11 +53,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688466019, "lastModified": 1725024810,
"narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,17 +77,16 @@
}, },
"rust": { "rust": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1688438033, "lastModified": 1724984647,
"narHash": "sha256-wOmpZis06pVKTR+5meGwhrW10/buf98lnA26uQLaqek=", "narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c3e43223dece545cfe06ddd92fd782adc73d56c3", "rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,21 +94,6 @@
"repo": "rust-overlay", "repo": "rust-overlay",
"type": "github" "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", "root": "root",

5
flake.nix
View file

@ -24,7 +24,7 @@
let let
pkgs = nixpkgs.legacyPackages.${system}.extend rust.overlays.default; pkgs = nixpkgs.legacyPackages.${system}.extend rust.overlays.default;
rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
craneLib = crane.lib.${system}.overrideToolchain rust-toolchain; craneLib = (crane.mkLib pkgs).overrideToolchain rust-toolchain;
craneArgs = { craneArgs = {
pname = "cosmic-comp"; pname = "cosmic-comp";
version = self.rev or "dirty"; version = self.rev or "dirty";
@ -56,6 +56,7 @@
mesa # For libgbm mesa # For libgbm
fontconfig fontconfig
stdenv.cc.cc.lib stdenv.cc.cc.lib
pixman
]; ];
runtimeDependencies = with pkgs; [ runtimeDependencies = with pkgs; [
@ -79,7 +80,7 @@
LD_LIBRARY_PATH = lib.makeLibraryPath (__concatMap (d: d.runtimeDependencies) (__attrValues self'.checks)); LD_LIBRARY_PATH = lib.makeLibraryPath (__concatMap (d: d.runtimeDependencies) (__attrValues self'.checks));
# include build inputs # include build inputs
inputsFrom = [cosmic-comp]; inputsFrom = [ cosmic-comp ];
}; };
}; };
}; };