mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 06:01:15 +00:00
brave: wrap with GAppsHook (#50450)
Fixes crashing when using file chooser GUI. Also added version to name and removed extraneous copying from source archive.
This commit is contained in:
parent
5aa34d934d
commit
ff55dd4c43
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue