diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index f2c7aa843dbc..643cddcf2aca 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -1,37 +1,38 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, cmake -, pkg-config -, openssl -, fontconfig -, nasm -, libX11 -, libXcursor -, libXrandr -, libXi -, libGL -, libxkbcommon -, wayland -, stdenv -, gtk3 -, darwin -, perl -, wrapGAppsHook3 +{ + lib, + rustPlatform, + fetchFromGitHub, + cmake, + pkg-config, + openssl, + fontconfig, + nasm, + libX11, + libXcursor, + libXrandr, + libXi, + libGL, + libxkbcommon, + wayland, + stdenv, + gtk3, + darwin, + perl, + wrapGAppsHook3, }: rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.23"; + version = "0.9.1"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-Dg1FFB9WVB4SWInSyOYb1TCPAtCa9gwsFLUX+UhL4DY="; + hash = "sha256-6jow0ektqmEcwFEaJgPqhJPs8LlYmPRLE+zqk1T4wDk="; }; - cargoHash = "sha256-Ze3ACs9WyoxNsaeJlZWhR0g+aFsntwNLLYbw2RnmwfE="; + cargoHash = "sha256-0e4FoWhZwq6as0JYHGj1zoAOSr71ztqtWJEY3QXDs9s="; nativeBuildInputs = [ cmake @@ -41,33 +42,37 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = [ - openssl - fontconfig - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libGL - libX11 - libXcursor - libXi - libXrandr - gtk3 + buildInputs = + [ + openssl + fontconfig + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libGL + libX11 + libXcursor + libXi + libXrandr + gtk3 - libxkbcommon - wayland - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; + libxkbcommon + wayland + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libobjc + ]; checkFlags = [ "--skip=bench" "--skip=tests::net" # requires network access + "--skip=tests::flathub" ]; postInstall = '' - install -Dm444 $src/res/oculante.png -t $out/share/icons/hicolor/128x128/apps/ + install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/ install -Dm444 $src/res/oculante.desktop -t $out/share/applications wrapProgram $out/bin/oculante \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} ''; meta = with lib; { @@ -77,6 +82,9 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; license = licenses.mit; mainProgram = "oculante"; - maintainers = with maintainers; [ dit7ya figsoda ]; + maintainers = with maintainers; [ + dit7ya + figsoda + ]; }; }