Unverified Commit 3b56a79a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #285617 from k3a/diffuse-icons 

diffuse: fix missing icons and use absolute path to macos bundle in the diffuse CLI wrapper for macos
parents 701a8dca b279badb

pkgs/applications/misc/diffuse/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, python3

, atk

, gtk3

, hicolor-icon-theme

}:



python3.pkgs.buildPythonApplication rec {
@@ -47,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { 


  preConfigure = ''

    # app bundle for macos

    substituteInPlace src/diffuse/meson.build data/icons/meson.build --replace "/Applications" "$out/Applications";

    substituteInPlace src/diffuse/meson.build data/icons/meson.build src/diffuse/mac-os-app/diffuse-mac.in --replace-fail "/Applications" "$out/Applications";

  '';



  mesonFlags = [
@@ -57,6 +58,10 @@ python3.pkgs.buildPythonApplication rec { 
  # to avoid running gtk-update-icon-cache, update-desktop-database and glib-compile-schemas

  DESTDIR = "/";



  makeWrapperArgs = [

      "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"

  ];



  passthru = {

    updateScript = gitUpdater {

      rev-prefix = "v";