Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-03 20:42:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update nix packages
Some checks failed
Rust-build / Build (push) Has been cancelled
Details

Browse source
This commit is contained in:
DashieTM 2025-02-15 16:17:06 +01:00
parent f09ed75581
commit f229ed7dea
5 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.direnv/flake-profile
View file

@ -1 +1 @@
flake-profile-1-link flake-profile-4-link

1
.direnv/flake-profile-1-link
View file

@ -1 +0,0 @@
/nix/store/bfq0hy0fwh0hpm6rivbrrjyb4x902pha-nix-shell-env

1
.direnv/flake-profile-4-link Symbolic link
View file

@ -0,0 +1 @@
/nix/store/30prmd5nyydss0bcs7d578grjav6i7x3-nix-shell-env

24
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727826117, "lastModified": 1738453229,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1739446958,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1728538411, "lastModified": 1736320768,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +64,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1729564184, "lastModified": 1739586408,
"narHash": "sha256-dP764PQ6YhjY7C84Txnrb2vf0H2YdQlp5c6a7G18fgw=", "narHash": "sha256-UN9hRKRE1eLU8C0cioTZubaCZQTA8NDc8/4vCpS5pS0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d687672b4541496408068bc273d94c643005d4c9", "rev": "3dbc0ce1c0690b83cfb9a9a51fbe90c3bc8f9916",
"type": "github" "type": "github"
}, },
"original": { "original": {

118
nix/default.nix
View file

@ -1,69 +1,69 @@
{ rustPlatform {
, rust-bin rustPlatform,
, pulseaudio rust-bin,
, dbus pulseaudio,
, gdk-pixbuf dbus,
, gnome gdk-pixbuf,
, pkg-config adwaita-icon-theme,
, wrapGAppsHook4 pkg-config,
, gtk4 wrapGAppsHook4,
, libadwaita gtk4,
, python312Packages libadwaita,
, flatpak python312Packages,
, flatpak-builder flatpak,
, lib flatpak-builder,
, lockFile lib,
, ... lockFile,
}: ...
let }: let
cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml); cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml);
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ReSet"; pname = "ReSet";
version = cargoToml.package.version; version = cargoToml.package.version;
src = ../.; src = ../.;
buildInputs = [ buildInputs = [
gtk4 gtk4
libadwaita libadwaita
pulseaudio pulseaudio
dbus dbus
gdk-pixbuf gdk-pixbuf
gnome.adwaita-icon-theme adwaita-icon-theme
python312Packages.aiohttp python312Packages.aiohttp
python312Packages.toml python312Packages.toml
flatpak flatpak
flatpak-builder flatpak-builder
]; ];
cargoLock = { cargoLock = {
inherit lockFile; inherit lockFile;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
rust-bin.nightly."2024-05-10".default rust-bin.nightly."2024-05-10".default
]; ];
copyLibs = true; copyLibs = true;
postInstall = '' postInstall = ''
install -D --mode=444 $src/${pname}.desktop $out/share/applications/${pname}.desktop install -D --mode=444 $src/${pname}.desktop $out/share/applications/${pname}.desktop
install -D --mode=444 $src/src/resources/icons/${pname}.svg $out/share/pixmaps/${pname}.svg install -D --mode=444 $src/src/resources/icons/${pname}.svg $out/share/pixmaps/${pname}.svg
''; '';
# test is broken in nix for some reason # test is broken in nix for some reason
doInstallCheck = false; doInstallCheck = false;
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
description = "A wip universal Linux settings application."; description = "A wip universal Linux settings application.";
homepage = "https://github.com/Xetibo/ReSet"; homepage = "https://github.com/Xetibo/ReSet";
changelog = "https://github.com/Xetibo/ReSet/releases/tag/${version}"; changelog = "https://github.com/Xetibo/ReSet/releases/tag/${version}";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ DashieTM ]; maintainers = with maintainers; [DashieTM];
mainProgram = "ReSet"; mainProgram = "ReSet";
}; };
} }