Unverified Commit 2525630f authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 43f7188e 55ca7939

pkgs/applications/networking/browsers/chromium/common.nix

+8 −4
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ let 




  base = rec {

    pname = "${packageName}-unwrapped";

    pname = "${lib.optionalString ungoogled "ungoogled-"}${packageName}-unwrapped";

    inherit (upstream-info) version;

    inherit packageName buildType buildPath;
@@ -237,7 +237,7 @@ let 
      ++ lib.optional pulseSupport libpulseaudio;



    patches = [

      ./cross-compile.patch

      ./patches/cross-compile.patch

      # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):

      ./patches/no-build-timestamps.patch

      # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:
@@ -256,7 +256,7 @@ let 
      })

    ] ++ lib.optionals (chromiumVersionAtLeast "120") [

      # We need to revert this patch to build M120+ with LLVM 16:

      ./chromium-120-llvm-16.patch

      ./patches/chromium-120-llvm-16.patch

    ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [

      # Fix build with at-spi2-core ≥ 2.49

      # This version is still needed for electron.
@@ -387,9 +387,13 @@ let 
      # depending on which part of the codebase you are in; see:

      # https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44

      custom_toolchain = "//build/toolchain/linux/unbundle:default";

      host_toolchain = "//build/toolchain/linux/unbundle:default";

      # We only build those specific toolchains when we cross-compile, as native non-cross-compilations would otherwise

      # end up building much more things than they need to (roughtly double the build steps and time/compute):

    } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {

      host_toolchain = "//build/toolchain/linux/unbundle:host";

      v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host";



    } // {

      host_pkg_config = "${pkgsBuildBuild.pkg-config}/bin/pkg-config";

      pkg_config      = "${pkgsBuildHost.pkg-config}/bin/${stdenv.cc.targetPrefix}pkg-config";

pkgs/applications/video/mpv/scripts/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ in lib.recurseIntoAttrs 
    quality-menu = callPackage ./quality-menu.nix { inherit buildLua; };

    simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; };

    sponsorblock = callPackage ./sponsorblock.nix { };

    sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { inherit buildLua; };

    thumbfast = callPackage ./thumbfast.nix { inherit buildLua; };

    thumbnail = callPackage ./thumbnail.nix { inherit buildLua; };

    uosc = callPackage ./uosc.nix { inherit buildLua; };

pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{ lib

, buildLua

, fetchFromGitea

, curl

}:



buildLua {

  pname = "mpv_sponsorblock_minimal";

  version = "unstable-2023-08-20";

  scriptPath = "sponsorblock_minimal.lua";



  src = fetchFromGitea {

    domain = "codeberg.org";

    owner = "jouni";

    repo = "mpv_sponsorblock_minimal";

    rev = "ca2844b8cf7674bfccd282d389a50427742251d3";

    hash = "sha256-28HWZ6nOhKiE+5Ya1N3Vscd8aeH9OKS0t72e/xPfFQQ=";

  };



  preInstall = ''

    substituteInPlace sponsorblock_minimal.lua \

      --replace "curl" "${lib.getExe curl}"

  '';



  meta = with lib; {

    description = "A minimal script to skip sponsored segments of YouTube videos";

    homepage = "https://codeberg.org/jouni/mpv_sponsorblock_minimal";

    license = licenses.gpl3Only;

    platforms = platforms.all;

    maintainers = with maintainers; [ arthsmn ];

  };

}