diff options
| author | hyperfekt <hyperfekt@users.noreply.github.com> | 2018-11-22 09:09:09 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-11-22 03:09:09 -0500 |
| commit | ff55dd4c43b276c47fbc0c65dbd9db81f9a2c979 (patch) | |
| tree | b27152d4584added0a9bb1933d40096ca465953d /pkgs/applications/networking/browsers/brave | |
| parent | 5aa34d934d62c769a89dccaad55caf713985ef81 (diff) | |
brave: wrap with GAppsHook (#50450)
Fixes crashing when using file chooser GUI. Also added version to name and
removed extraneous copying from source archive.
Diffstat (limited to 'pkgs/applications/networking/browsers/brave')
| -rw-r--r-- | pkgs/applications/networking/browsers/brave/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 3c0993d87339..725adda56e7d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -12,6 +12,7 @@ gdk_pixbuf, glib, gnome2, + gnome3, gtk3, libuuid, libX11, @@ -31,7 +32,8 @@ udev, xorg, zlib, - xdg_utils + xdg_utils, + wrapGAppsHook }: let rpath = lib.makeLibraryPath [ @@ -71,7 +73,7 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { - name = "brave"; + name = "brave-${version}"; version = "0.56.12"; src = fetchurl { @@ -83,14 +85,16 @@ in stdenv.mkDerivation rec { dontBuild = true; dontPatchELF = true; - nativeBuildInputs = [ dpkg ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; + + buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; installPhase = '' - mkdir -p $out + mkdir -p $out $out/bin - cp -R usr/* $out + cp -R usr/share $out cp -R opt/ $out/opt export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser |