Commit 4dc9b838 authored by Yureka's avatar Yureka
Browse files

electron_39: fix build

parent 7267b649

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

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ let 


        mkdir -p third_party/jdk/current/bin

      ''

      + lib.optionalString (chromiumVersionAtLeast "142") ''

      + lib.optionalString (!isElectron && chromiumVersionAtLeast "142") ''

        cat << EOF > gpu/webgpu/dawn_commit_hash.h

        /* Generated by lastchange.py, do not edit.*/

        #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_

pkgs/by-name/gc/gclient2nix/gclient2nix.py

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ class GitilesRepo(Repo): 
        # (making it count the compressed instead of uncompressed size)

        # rather than complying with it.

        if url == "https://chromium.googlesource.com/chromium/src.git":

            self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; "

            self.args["postFetch"] = "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); "

            self.args["postFetch"] += "rm -r $out/content/test/data; "

            self.args["postFetch"] += "rm -rf $out/courgette/testdata; "

            self.args["postFetch"] += "rm -r $out/extensions/test/data; "

pkgs/development/tools/electron/common.nix

+17 −0
Original line number Diff line number Diff line
@@ -190,6 +190,17 @@ in 
    EOF



    echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION

  ''

  + lib.optionalString (lib.versionAtLeast info.version "39") ''

    cat << EOF > gpu/webgpu/dawn_commit_hash.h

    /* Generated by lastchange.py, do not edit.*/

    #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_

    #define GPU_WEBGPU_DAWN_COMMIT_HASH_H_

    #define DAWN_COMMIT_HASH "${info.deps."src/third_party/dawn".args.rev}"

    #endif  // GPU_WEBGPU_DAWN_COMMIT_HASH_H_

    EOF

  ''

  + ''



    (

      cd electron
@@ -273,6 +284,12 @@ in 
    enable_dangling_raw_ptr_feature_flag = false;

    clang_unsafe_buffers_paths = "";

    enterprise_cloud_content_analysis = false;

  }

  // lib.optionalAttrs (lib.versionAtLeast info.version "39") {

    enable_linux_installer = false;

    enable_pdf_save_to_drive = false;

  }

  // {



    # other

    enable_widevine = false;

pkgs/development/tools/electron/info.json

+2 −2
Original line number Diff line number Diff line
@@ -3995,8 +3995,8 @@ 
        "deps": {

            "src": {

                "args": {

                    "hash": "sha256-K/3+t+Vh2IZZSx3Ld82m0I8GWAVVKYzAaS1HA6GNleU=",

                    "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",

                    "hash": "sha256-/gjznJOMyWs7kaUquYf4c1peCi3P6LQXnHUGdLROtz4=",

                    "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",

                    "tag": "142.0.7444.52",

                    "url": "https://chromium.googlesource.com/chromium/src.git"

                },