git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #49685 from rht/brave-0.55.22

brave: 0.25.2 -> 0.56.12

commit03187b7497c3a0eb7a140a75f3ad001c1876f6db authorSilvan Mosberger <infinisil@icloud.com> dateSun 11 Nov 2018, 22:13 (8 years ago) parentb529b81e46f25a
1 file changed+43−7
pkgs/applications/networking/browsers/brave/default.nix+43−7
pkgs/applications/networking/browsers/brave/default.nix+43−7
@@ -30,7 +30,8 @@
3030 pango,
3131 udev,
3232 xorg,
33− zlib
33+ zlib,
34+ xdg_utils
3435}:
3536
3637let rpath = lib.makeLibraryPath [
@@ -65,32 +66,67 @@ let rpath = lib.makeLibraryPath [
6566 udev
6667 xorg.libxcb
6768 zlib
69+ xdg_utils
6870];
6971
7072
7173in stdenv.mkDerivation rec {
7274 name = "brave";
73− version = "0.25.2";
75+ version = "0.56.12";
7476
7577 src = fetchurl {
76− url = "https://github.com/brave/browser-laptop/releases/download/v${version}dev/brave_${version}_amd64.deb";
77− sha256 = "1r3rsa6szps7mvvpqyw0mg16zn36x451dxq4nmn2l5ds5cp1f017";
78+ url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
79+ sha256 = "1pvablwchpsm1fdhfp9kr2912yv4812r8prv5fn799qpflzxvyai";
7880 };
7981
80− phases = [ "unpackPhase" "installPhase" ];
82+ dontConfigure = true;
83+ dontBuild = true;
84+ dontPatchELF = true;
8185
8286 nativeBuildInputs = [ dpkg ];
8387
84− unpackPhase = "dpkg-deb -x $src .";
88+ unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
8589
8690 installPhase = ''
8791 mkdir -p $out
8892
8993 cp -R usr/* $out
94+ cp -R opt/ $out/opt
95+
96+ export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
97+
98+ # Fix path to bash in $BINARYWRAPPER
99+ substituteInPlace $BINARYWRAPPER \
100+ --replace /bin/bash ${stdenv.shell}
101+
102+ ln -sf $BINARYWRAPPER $out/bin/brave
90103
91104 patchelf \
92105 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
93− --set-rpath "${rpath}" $out/bin/brave
106+ --set-rpath "${rpath}" $out/opt/brave.com/brave/brave
107+
108+ # Fix paths
109+ substituteInPlace $out/share/applications/brave-browser.desktop \
110+ --replace /usr/bin/brave-browser $out/bin/brave
111+ substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
112+ --replace /opt/brave.com $out/opt/brave.com
113+ substituteInPlace $out/share/menu/brave-browser.menu \
114+ --replace /opt/brave.com $out/opt/brave.com
115+ substituteInPlace $out/opt/brave.com/brave/default-app-block \
116+ --replace /opt/brave.com $out/opt/brave.com
117+
118+ # Correct icons location
119+ icon_sizes=("16" "22" "24" "32" "48" "64" "128" "256")
120+
121+ for icon in ''${icon_sizes[*]}
122+ do
123+ mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
124+ ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
125+ done
126+
127+ # Replace xdg-settings and xdg-mime
128+ ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
129+ ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
94130 '';
95131
96132 meta = with stdenv.lib; {