From 1f4629016e312f0daad599d9b08d545763e90e70 Mon Sep 17 00:00:00 2001 From: RAVENz46 Date: Wed, 15 Jan 2025 19:55:26 +0900 Subject: [PATCH] oculante: fix icon, add wayland support wayland linux only --- pkgs/by-name/oc/oculante/package.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 643cddcf2aca..e3febb9abccd 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -54,7 +54,6 @@ rustPlatform.buildRustPackage rec { libXi libXrandr gtk3 - libxkbcommon wayland ] @@ -69,20 +68,28 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/ + install -Dm444 $src/res/icons/icon.png $out/share/icons/hicolor/128x128/apps/oculante.png 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 + libxkbcommon + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ] + ) + } ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Minimalistic crossplatform image viewer written in Rust"; homepage = "https://github.com/woelper/oculante"; changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "oculante"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dit7ya figsoda ];