Merge pull request #250475 from MatthewCash/fix/gaphor-double-wrapper

gaphor: fix double wrapping

authored by Jonas Heinrich and committed by GitHub 0de6f40e 77e2fd00

+6 -5
+6 -5
pkgs/tools/misc/gaphor/default.nix
··· 59 59 desktopName = "Gaphor"; 60 60 }; 61 61 62 - # We need to wrap it manually to resolve all icons 62 + # Disable automatic wrapGAppsHook to prevent double wrapping 63 63 dontWrapGApps = true; 64 64 65 65 postInstall = '' ··· 67 67 ''; 68 68 69 69 preFixup = '' 70 - wrapProgram $out/bin/gaphor \ 71 - ''${gappsWrapperArgs[@]} \ 72 - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ 73 - --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" 70 + makeWrapperArgs+=( 71 + "''${gappsWrapperArgs[@]}" \ 72 + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ 73 + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" 74 + ) 74 75 ''; 75 76 76 77 meta = with lib; {