brave: 0.25.2 -> 0.56.12 #49685
brave: 0.25.2 -> 0.56.12 #49685
Conversation
GrahamcOfBorg
added
10.rebuild-darwin: 0
|
The |
|
@emmanuelrosa thanks for testing for the blind spot (there are probably other issues with the dpkg /opt paths though); I had just fixed it. |
|
Yeah, that happens with packages from other distros. Here's a list of what may need patching: |
|
I have patched brave-browser.xml, brave-browser.menu, default-app-block, but xdg-settings and xdg-mime have lots of assumptions on the path of gnom, /usr/share, /usr/bin/file, ... that it is impractical to patch every single path by hand. |
Those scripts are currently within |
Ok, fixed the scripts. |
|
@rht I've just checked and the attribute name is Also I went ahead and switched your path corrections to use nixpkgs/pkgs/stdenv/generic/setup.sh Line 749 in 4d1abc4 quoted everything, and made the derivation not explicitly declare phases as per #28910.(probably add this to the commit msg) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 24f606e5c3a..6a9726b3ec3 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -79,43 +79,44 @@ in stdenv.mkDerivation rec {
sha256 = "0111wbzyp2n8s0yskzq7xp7ipv5l6nyqzjczhh23j8yagm084kki";
};
- phases = [ "unpackPhase" "installPhase" ];
+ dontConfigure = true;
+ dontBuild = true;
nativeBuildInputs = [ dpkg ];
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
installPhase = ''
- mkdir -p $out
+ mkdir -p "$out"
- cp -R usr/* $out
- cp -R opt/ $out/opt
+ cp -R "usr/"* "$out"
+ cp -R "opt" "$out/opt"
- export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
+ export BINARYWRAPPER="$out/opt/brave.com/brave/brave-browser"
# Fix path to bash in $BINARYWRAPPER
- substituteInPlace $BINARYWRAPPER \
- --replace /bin/bash ${stdenv.shell}
+ substituteInPlace "$BINARYWRAPPER" \
+ --replace "/bin/bash" "${stdenv.shell}"
- ln -sf $BINARYWRAPPER $out/bin/brave-browser
+ ln -sf "$BINARYWRAPPER" "$out/bin/brave-browser"
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${rpath}" $out/opt/brave.com/brave/brave
+ --set-rpath "${rpath}" "$out/opt/brave.com/brave/brave"
# Fix paths
- substituteAllInPlace $out/share/applications/brave-browser.desktop \
- --replace /usr/bin/brave-browser $out/bin/brave-browser
- substituteAllInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
- --replace /opt/brave.com $out/opt/brave.com
- substituteAllInPlace $out/share/menu/brave-browser.menu \
- --replace /opt/brave.com $out/opt/brave.com
- substituteAllInPlace $out/opt/brave.com/brave/default-app-block \
- --replace /opt/brave.com $out/opt/brave.com
+ substituteInPlace "$out/share/applications/brave-browser.desktop" \
+ --replace "/usr/bin/brave-browser" "$out/bin/brave-browser"
+ substituteInPlace "$out/share/gnome-control-center/default-apps/brave-browser.xml" \
+ --replace "/opt/brave.com" "$out/opt/brave.com"
+ substituteInPlace "$out/share/menu/brave-browser.menu" \
+ --replace "/opt/brave.com" "$out/opt/brave.com"
+ substituteInPlace "$out/opt/brave.com/brave/default-app-block" \
+ --replace "/opt/brave.com" "$out/opt/brave.com"
# Replace xdg-settings and xdg-mime
- ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
- ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
+ ln -sf "${xdg_utils}/bin/xdg-settings" "$out/opt/brave.com/brave/xdg-settings"
+ ln -sf "${xdg_utils}/bin/xdg-mime" "$out/opt/brave.com/brave/xdg-mime"
'';
meta = with stdenv.lib; { |
Ok I thought I will incorporate your changes except for the quoting. |
|
Still think that quoting anything that had a variable in would be a good idea. @GrahamcOfBorg build brave |
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: brave Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: brave Partial log (click to expand)
|
All the |
|
Unfortunately the browser no longer executes: At that point it exits. An older version of the package works: Here's a diff from the package that works to the current one: |
|
Ahh it needs |
|
Yep, adding |
|
Added |
|
Additionally, I renamed the binary from |
|
@GrahamcOfBorg build brave Just to check one more time FTR, should be good otherwise. |
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: brave Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: brave Partial log (click to expand)
|
Then you need to change |
Ah, right, fixed. |
|
Speaking of which, 0.56.12 was just released 2 days ago. So I am updating the version further. |
|
@GrahamcOfBorg build brave |
|
@rht Currently you need to be recognized as a trusted user or known user to use the ofborg tooling that way. Also I just noticed that they're shipping icons but they're not installed to the correct locations. diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index fff87025197..3c0993d8733 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -115,6 +115,15 @@ in stdenv.mkDerivation rec {
substituteInPlace $out/opt/brave.com/brave/default-app-block \
--replace /opt/brave.com $out/opt/brave.com
+ # Correct icons location
+ icon_sizes=("16" "22" "24" "32" "48" "64" "128" "256")
+
+ for icon in ''${icon_sizes[*]}
+ do
+ mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
+ ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
+ done
+
# Replace xdg-settings and xdg-mime
ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mimeI didn't move them because I'm not sure they expect them to be there. |
|
@worldofpeace I added your latest patch, which is a lot more succinct than how it is being done in chromium/google-chrome, for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
num_and_suffix="''${icon_file##*logo_}"
icon_size="''${num_and_suffix%.*}"
expr "$icon_size" : "^[0-9][0-9]*$" || continue
logo_output_prefix="$out/share/icons/hicolor"
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
mkdir -vp "$logo_output_path"
cp -v "$icon_file" "$logo_output_path/$packageName.png"
done |
|
@rht Yeah that's a little complex. I'm assuming here that icon sizes will remain fixed though. |
|
@GrahamcOfBorg build brave |
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: brave Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: brave Partial log (click to expand)
|
|
I've tested and:
Everything works fine within the browser. LGTM 👍 cc @Mic92 @infinisil (mergers) |
|
@rht Thank you for your cooperation and contribution ❇️ |
Motivation for this change
This switches to a chromium-based browser from a muon-based one.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)