Skip to content

Commit c840315

Browse files
committed
chore(iced): Update to 0.14
1 parent a718c6c commit c840315

11 files changed

Lines changed: 3933 additions & 1364 deletions

File tree

.envrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
use flake
2-
use flake

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/applications.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ in
4545

4646
cargoLock = {
4747
inherit lockFile;
48+
outputHashes = {
49+
"cryoglyph-0.1.0" = "sha256-Jc+rhzd5BIT7aYBtIfsBFFKkGChdEYhDHdYGiv4KE+c=";
50+
"dpi-0.1.1" = "sha256-hlVhlQ8MmIbNFNr6BM4edKdZbe+ixnPpKm819zauFLQ=";
51+
"iced-0.14.0-dev" = "sha256-ToInrksjWeUj7yKF4I7/GOD883abHX6WrmADCZrOa80=";
52+
};
4853
};
4954

5055
copyLibs = true;

nix/default.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,16 @@ in
4343
libclang
4444
];
4545

46+
# I legit hate how rust is handled by nix, it's unusable
4647
cargoLock = {
4748
inherit lockFile;
48-
#outputHashes = {
49-
# "oxiced-0.1.0" = "";
50-
#};
49+
outputHashes = {
50+
"cryoglyph-0.1.0" = "sha256-Jc+rhzd5BIT7aYBtIfsBFFKkGChdEYhDHdYGiv4KE+c=";
51+
"dpi-0.1.1" = "sha256-hlVhlQ8MmIbNFNr6BM4edKdZbe+ixnPpKm819zauFLQ=";
52+
"iced-0.14.0-dev" = "sha256-ToInrksjWeUj7yKF4I7/GOD883abHX6WrmADCZrOa80=";
53+
"iced_exdevtools-0.14.0-dev" = "sha256-1ncfSYSeHUl59cGchpbXyAh/IB6Mxse6D3P5CLRh9kE=";
54+
"oxiced-0.5.1" = "sha256-U8gYs3Xzvso0QdDapOTgR3sPPMDjdPc7jwbI32o3TyE=";
55+
};
5156
};
5257

5358
nativeBuildInputs = [

nix/hm.nix

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,20 @@ in {
5353
then "lib${lib.replaceStrings ["-"] ["_"] entry.pname}.so"
5454
else "")
5555
cfg.config.plugins;
56+
plugin_files = builtins.listToAttrs (builtins.map
57+
(pkg: {
58+
name = ".config/oxirun/plugins/lib${lib.replaceStrings ["-"] ["_"] pkg.pname}.so";
59+
value = {
60+
source = "${pkg}/lib/lib${lib.replaceStrings ["-"] ["_"] pkg.pname}.so";
61+
};
62+
})
63+
cfg.config.plugins);
5664
in
5765
lib.mkIf
5866
cfg.enable
5967
{
6068
home.packages = lib.optional (cfg.package != null) cfg.package ++ cfg.config.plugins;
61-
home.file = builtins.listToAttrs (builtins.map
62-
(pkg: {
63-
name = ".config/oxirun/plugins/lib${lib.replaceStrings ["-"] ["_"] pkg.pname}.so";
64-
value = {
65-
source = "${pkg}/lib/lib${lib.replaceStrings ["-"] ["_"] pkg.pname}.so";
66-
};
67-
})
68-
cfg.config.plugins);
69+
home.file = plugin_files;
6970

7071
xdg.configFile."oxirun/config.toml".source =
7172
(pkgs.formats.toml {}).generate "oxirun"

0 commit comments

Comments
 (0)