Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c3441f7498fd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e30ad610ab0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 27, 2019

  1. franz: use wrapGAppsHook 

    I encountered crashes while opening the file selection dialog.

```
(franz:11597): GLib-GIO-ERROR **: 14:08:20.102: No GSettings schemas are installed on the system
[1]    11597 trace trap  franz
```

This error is also presented in various other gtk applications (e.g. #45286). I used the same trick to fix this error.
    @contrun
    contrun committed Jun 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    nolmoonen Nol Moonen
    GPG key ID: 486F753FC25B6289
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5fff5ef View commit details

Commits on Jul 4, 2019

  1. Merge pull request #63761 from contrun/patch-1 

    franz: use wrapGAppsHook
    @worldofpeace
    worldofpeace authored Jul 4, 2019
    Copy the full SHA
    5e30ad6 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/applications/networking/instant-messengers/franz/default.nix
10 changes: 7 additions & 3 deletions pkgs/applications/networking/instant-messengers/franz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg
{ stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:

@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps
dontPatchELF = true;

nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ];
buildInputs = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
@@ -37,8 +37,12 @@ in stdenv.mkDerivation rec {
--replace Exec=\"/opt/Franz/franz\" Exec=franz
'';

dontWrapGApps = true;

postFixup = ''
wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin
wrapProgram $out/opt/Franz/franz \
--prefix PATH : ${xdg_utils}/bin \
"''${gappsWrapperArgs[@]}"
'';

meta = with stdenv.lib; {