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

update flake

Browse source
This commit is contained in:
Ashley Wulber 2023-06-26 17:36:23 -04:00 • committed by Ashley Wulber
parent 0ebe53201f
commit 0b0a30898d
3 changed files with 81 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

90
flake.lock generated
View file

@ -10,11 +10,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1672095661, "lastModified": 1687310026,
"narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=", "narHash": "sha256-20RHFbrnC+hsG4Hyeg/58LvQAK7JWfFItTPFAFamu8E=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "98894bb39b03bfb379c5e10523cd61160e1ac782", "rev": "116b32c30b5ff28e49f4fcbeeb1bbe3544593204",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -31,11 +31,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1672468395, "lastModified": 1687760804,
"narHash": "sha256-eIrQGHZub98IiLqtFXa00ooHBCjtKY+rfKJs5lhyF/c=", "narHash": "sha256-4aJlNuAI+AjrUid9hmjdqwJxT7y/HCHptC2dtDmuEWU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "d6f9bdfb4a25395b15f6c6feba3d0bba5e62b3ce", "rev": "2102665784dba3f11314e37b4027794ccd324f1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -47,11 +47,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668681692, "lastModified": 1673956053,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1", "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,12 +61,15 @@
} }
}, },
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1685518550,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,12 +79,15 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1687709756,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,11 +98,11 @@
}, },
"nix-filter": { "nix-filter": {
"locked": { "locked": {
"lastModified": 1666547822, "lastModified": 1687178632,
"narHash": "sha256-razwnAybPHyoAyhkKCwXdxihIqJi1G6e1XP4FQOJTEs=", "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
"owner": "numtide", "owner": "numtide",
"repo": "nix-filter", "repo": "nix-filter",
"rev": "1a3b735e13e90a8d2fd5629f2f8363bd7ffbbec7", "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +113,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1672428209, "lastModified": 1687701825,
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +139,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1672438471, "lastModified": 1687732103,
"narHash": "sha256-bB/7XFnRgGhOhYY6HIov7eF/qnR5NPtKtSfDa2aWqh8=", "narHash": "sha256-5Jn/Nj/xgcjTT289Itng55GLUBTEIULPndl/XrGkUwQ=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "0d76b94c90a20c20d3e57ea1ab03d9afa00dee72", "rev": "4a2ceeff0fb53de168691b0f55d9808d221b867e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,11 +165,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670034122, "lastModified": 1685759304,
"narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=", "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65", "rev": "c535b4f3327910c96dcf21851bbdd074d0760290",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,6 +177,36 @@
"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"
}
},
"systems_2": {
"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",

14
flake.nix
View file

@ -22,6 +22,8 @@
craneLib = crane.lib.${system}.overrideToolchain fenix.packages.${system}.stable.toolchain; craneLib = crane.lib.${system}.overrideToolchain fenix.packages.${system}.stable.toolchain;
pkgDef = { pkgDef = {
pname = "cosmic-applets";
version = "0.1.0";
src = nix-filter.lib.filter { src = nix-filter.lib.filter {
root = ./.; root = ./.;
exclude = [ exclude = [
@ -29,11 +31,10 @@
./flake.nix ./flake.nix
./flake.lock ./flake.lock
./LICENSE ./LICENSE
./justfile
./debian ./debian
]; ];
}; };
nativeBuildInputs = with pkgs; [ pkg-config autoPatchelfHook ]; nativeBuildInputs = with pkgs; [ just pkg-config autoPatchelfHook ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
libxkbcommon libxkbcommon
glib # For gobject glib # For gobject
@ -53,7 +54,14 @@
inherit cosmic-applets; inherit cosmic-applets;
}; };
packages.default = cosmic-applets; packages.default = cosmic-applets.overrideAttrs (oldAttrs: rec {
buildPhase = ''
just prefix=$out build-release
'';
installPhase = ''
just prefix=$out install
'';
});
apps.default = flake-utils.lib.mkApp { apps.default = flake-utils.lib.mkApp {
drv = cosmic-applets; drv = cosmic-applets;

7
justfile
View file

@ -17,6 +17,13 @@ build: _extract_vendor
#!/usr/bin/env bash #!/usr/bin/env bash
cargo build {{cargo_args}} cargo build {{cargo_args}}
# Compiles with debug profile
build-debug *args:
cargo build {{args}}
# Compiles with release profile
build-release *args: (build-debug '--release' args)
_install_icon path: _install_icon path:
install -Dm0644 {{path}} {{iconsdir}}/{{file_name(path)}} install -Dm0644 {{path}} {{iconsdir}}/{{file_name(path)}}