diff --git a/include/vesktop/icon.icns b/include/vesktop/icon.icns new file mode 100644 index 0000000..4bc39dc Binary files /dev/null and b/include/vesktop/icon.icns differ diff --git a/nix/lib/darwin/mkApp.nix b/nix/lib/darwin/mkApp.nix index 220124d..2a68ffa 100644 --- a/nix/lib/darwin/mkApp.nix +++ b/nix/lib/darwin/mkApp.nix @@ -2,6 +2,7 @@ { stdenv, undmg, _7zz, pname, version, sourceRoot ? ".", appFileName, src, meta , nativeBuildInputs ? [ undmg _7zz ] , unpackPhase ? "undmg $src || 7zz x -snld $src" +, configurePhase ? "" , installPhase ? '' mkdir -p $out/Applications cp -R ${appFileName} "$out/Applications/" @@ -15,8 +16,8 @@ stdenv.mkDerivation rec { inherit sourceRoot; - phases = [ "unpackPhase" "installPhase" ]; - inherit unpackPhase installPhase; + phases = [ "unpackPhase" "configurePhase" "installPhase" ]; + inherit unpackPhase configurePhase installPhase; inherit meta; } diff --git a/nix/overlays/darwin/vesktop.nix b/nix/overlays/darwin/vesktop.nix index b026909..7cc818d 100644 --- a/nix/overlays/darwin/vesktop.nix +++ b/nix/overlays/darwin/vesktop.nix @@ -3,20 +3,27 @@ final: prev: let mkApp = import ../../lib/darwin/mkApp.nix; + + appFileName = "Vesktop.app"; version = "1.5.3"; in { vesktop = mkApp { inherit (final) stdenv undmg _7zz; pname = "Vesktop"; - appFileName = "Vesktop*.app"; - inherit version; + inherit appFileName version; src = final.fetchurl { url = "https://github.com/Vencord/Vesktop/releases/download/v${version}/Vesktop-${version}-universal.dmg"; hash = "sha256-ceOUNHSOaEqCbzkM64RtUu0Yhrq4tThcXZTDd+OsEXI"; }; + # Replace the icon with a much more low profile icon + # REF: https://github.com/Vencord/Vesktop/pull/865 + configurePhase = '' + cp -f ${../../../include/vesktop/icon.icns} ${appFileName}/Contents/Resources/icon.icns + ''; + meta = with final.lib; { description = "An alternate client for Discord with Vencord built-in"; homepage = "https://github.com/Vencord/Vesktop"; diff --git a/nix/systems/darwin/configuration.nix b/nix/systems/darwin/configuration.nix index f7929ca..d1e7600 100644 --- a/nix/systems/darwin/configuration.nix +++ b/nix/systems/darwin/configuration.nix @@ -30,15 +30,16 @@ in { pkgs.jq # lan-mouse deps - (libFixup { package = pkgs.libadwaita; inherit (pkgs) runCommandLocal; name = "libadwaita"; }) - (libFixup { package = pkgs.gtk4; inherit (pkgs) runCommandLocal; name = "gtk4"; }) - (libFixup { package = pkgs.pango; inherit (pkgs) runCommandLocal; name = "pango"; }) - (libFixup { package = pkgs.harfbuzz; inherit (pkgs) runCommandLocal; name = "harfbuzz"; }) - (libFixup { package = pkgs.gdk-pixbuf; inherit (pkgs) runCommandLocal; name = "gdk-pixbuf"; }) - (libFixup { package = pkgs.cairo; inherit (pkgs) runCommandLocal; name = "cairo"; }) - (libFixup { package = pkgs.graphene; inherit (pkgs) runCommandLocal; name = "graphene"; }) - (libFixup { package = pkgs.glib; inherit (pkgs) runCommandLocal; name = "glib"; }) - (libFixup { package = pkgs.gettext; inherit (pkgs) runCommandLocal; name = "gettext"; }) + # FIXME: Find a better way to link /lib to /usr/local/opt//lib + # (libFixup { package = pkgs.libadwaita; inherit (pkgs) runCommandLocal; name = "libadwaita"; }) + # (libFixup { package = pkgs.gtk4; inherit (pkgs) runCommandLocal; name = "gtk4"; }) + # (libFixup { package = pkgs.pango; inherit (pkgs) runCommandLocal; name = "pango"; }) + # (libFixup { package = pkgs.harfbuzz; inherit (pkgs) runCommandLocal; name = "harfbuzz"; }) + # (libFixup { package = pkgs.gdk-pixbuf; inherit (pkgs) runCommandLocal; name = "gdk-pixbuf"; }) + # (libFixup { package = pkgs.cairo; inherit (pkgs) runCommandLocal; name = "cairo"; }) + # (libFixup { package = pkgs.graphene; inherit (pkgs) runCommandLocal; name = "graphene"; }) + # (libFixup { package = pkgs.glib; inherit (pkgs) runCommandLocal; name = "glib"; }) + # (libFixup { package = pkgs.gettext; inherit (pkgs) runCommandLocal; name = "gettext"; }) pkgs.pinentry_mac # for GPG