public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

brave: wrap with GAppsHook (#50450)

Browse Source 
Fixes crashing when using file chooser GUI. Also added version to name and
removed extraneous copying from source archive.
This commit is contained in:
hyperfekt 2018-11-22 09:09:09 +01:00 committed by worldofpeace
parent 5aa34d934d
commit ff55dd4c43
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -12,6 +12,7 @@
gdk_pixbuf, gdk_pixbuf,
glib, glib,
gnome2, gnome2,
gnome3,
gtk3, gtk3,
libuuid, libuuid,
libX11, libX11,
@ -31,7 +32,8 @@
udev, udev,
xorg, xorg,
zlib, zlib,
xdg_utils xdg_utils,
wrapGAppsHook
}: }:
let rpath = lib.makeLibraryPath [ let rpath = lib.makeLibraryPath [
@ -71,7 +73,7 @@ let rpath = lib.makeLibraryPath [
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "brave"; name = "brave-${version}";
version = "0.56.12"; version = "0.56.12";
src = fetchurl { src = fetchurl {
@ -83,14 +85,16 @@ in stdenv.mkDerivation rec {
dontBuild = true; dontBuild = true;
dontPatchELF = 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"; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out $out/bin
cp -R usr/* $out cp -R usr/share $out
cp -R opt/ $out/opt cp -R opt/ $out/opt
export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser