diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 09:57:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-22 09:57:08 +0100 |
| commit | c31cb577aed1e94e467ea1d6455fc275946d3b2d (patch) | |
| tree | fcabcf126d5e422fa998925403add39444c2a166 /pkgs/applications/networking/browsers/brave | |
| parent | 16267b4389c75cba9f0f10664043bd6d47013827 (diff) | |
| parent | 9467621b186dcaf8a24772482e0d8a6a581ce0bb (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers/brave')
| -rw-r--r-- | pkgs/applications/networking/browsers/brave/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f19c6009588c..d764a5388535 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 [ @@ -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 |