From b6433d21fcd3de8b53943dac4ed9690ebd2e70cd Mon Sep 17 00:00:00 2001 From: Bintang Date: Fri, 12 Apr 2024 16:16:44 +0700 Subject: [PATCH] brave: fix overriding --- .../networking/browsers/brave/default.nix | 52 ++++++++++++------- .../networking/browsers/brave/update.sh | 51 +++++++++++------- 2 files changed, 65 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 59ca619cabf8..eea9c90ac7b4 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,21 +1,35 @@ # Expression generated by update.sh; do not edit it by hand! -{ stdenv, callPackage }: +{ stdenv +, callPackage -if stdenv.isAarch64 then - callPackage ./make-brave.nix { } { - pname = "brave"; - version = "1.64.116"; - url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_arm64.deb"; - hash = "sha256-XC3GnutiTYdCOJPegj8MRYC5dRrBoKBg4k50ZFrlj4E="; - platform = "aarch64-linux"; - } -else if stdenv.isx86_64 then - callPackage ./make-brave.nix { } { - pname = "brave"; - version = "1.64.116"; - url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_amd64.deb"; - hash = "sha256-mnvFPfZu44TZGdUb+AxaJbecQrXkIzJkYvB4GO55uv0="; - platform = "x86_64-linux"; - } -else - throw "Unsupported platform." + # Package customization: +, commandLineArgs ? "" +, pulseSupport ? stdenv.isLinux +, libvaSupport ? stdenv.isLinux +, vulkanSupport ? false +}: + +callPackage ./make-brave.nix +{ + inherit commandLineArgs pulseSupport libvaSupport vulkanSupport; +} + ( + if stdenv.isAarch64 then + { + pname = "brave"; + version = "1.64.116"; + url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_arm64.deb"; + hash = "sha256-XC3GnutiTYdCOJPegj8MRYC5dRrBoKBg4k50ZFrlj4E="; + platform = "aarch64-linux"; + } + else if stdenv.isx86_64 then + { + pname = "brave"; + version = "1.64.116"; + url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_amd64.deb"; + hash = "sha256-mnvFPfZu44TZGdUb+AxaJbecQrXkIzJkYvB4GO55uv0="; + platform = "x86_64-linux"; + } + else + throw "Unsupported platform." + ) diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh index d850c2de688d..83ad2d29adbc 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -19,24 +19,37 @@ hashAmd64="$(nix hash to-sri --type sha256 \ cat > $SCRIPT_DIR/default.nix << EOF # Expression generated by update.sh; do not edit it by hand! -{ stdenv, callPackage }: +{ stdenv, callPackage -if stdenv.isAarch64 then - callPackage ./make-brave.nix { } { - pname = "brave"; - version = "${latestVersionAarch64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAarch64}_arm64.deb"; - hash = "${hashAarch64}"; - platform = "aarch64-linux"; - } -else if stdenv.isx86_64 then - callPackage ./make-brave.nix { } { - pname = "brave"; - version = "${latestVersionAmd64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb"; - hash = "${hashAmd64}"; - platform = "x86_64-linux"; - } -else - throw "Unsupported platform." +# Package customization: +, commandLineArgs ? "" +, pulseSupport ? stdenv.isLinux +, libvaSupport ? stdenv.isLinux +, vulkanSupport ? false +}: + +callPackage ./make-brave.nix +{ + inherit commandLineArgs pulseSupport libvaSupport vulkanSupport; +} + ( + if stdenv.isAarch64 then + { + pname = "brave"; + version = "${latestVersionAarch64}"; + url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb"; + hash = "${hashAarch64}"; + platform = "aarch64-linux"; + } + else if stdenv.isx86_64 then + { + pname = "brave"; + version = "${latestVersionAmd64}"; + url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb"; + hash = "${hashAmd64}"; + platform = "x86_64-linux"; + } + else + throw "Unsupported platform." + ) EOF