commit 14aa10941807ba2fa438858a6b7b5a0dbcfebe4a · pyrox.dev/nixpkgs

pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix

···

       113
       113
        
       

     

       114
       114
        
           # Fix build with Pipewire 1.4

     

       115
       115
        
           ./pipewire-1.4.patch

     

       116
       116
       +
           # Reproducibility QTBUG-136068

     

       117
       117
       +
           ./gn-object-sorted.patch

     

       116
       118
        
         ];

     

       117
       119
        
       

     

       118
       120
        
         postPatch =

+32

pkgs/development/libraries/qt-6/modules/qtwebengine/gn-object-sorted.patch

···

       1
       1
       +
       diff --git a/gn/src/gn/rsp_target_writer.cc b/gn/src/gn/rsp_target_writer.cc

     

       2
       2
       +
       index 6c1c687e99d..097b84b317e 100644

     

       3
       3
       +
       --- a/src/3rdparty/gn/src/gn/rsp_target_writer.cc

     

       4
       4
       +
       +++ b/src/3rdparty/gn/src/gn/rsp_target_writer.cc

     

       5
       5
       +
       @@ -117,8 +117,7 @@ void RspTargetWriter::Run() {

     

       6
       6
       +
              PathOutput path_output(settings->build_settings()->build_dir(),

     

       7
       7
       +
                                     settings->build_settings()->root_path_utf8(),

     

       8
       8
       +
                                     ESCAPE_NONE);

     

       9
       9
       +
       -      std::vector<SourceFile> object_files;

     

       10
       10
       +
       -      object_files.reserve(target_->sources().size());

     

       11
       11
       +
       +      std::set<SourceFile> object_files;

     

       12
       12
       +
        

     

       13
       13
       +
              for (const auto& source : target_->sources()) {

     

       14
       14
       +
                const char* tool_type = nullptr;

     

       15
       15
       +
       @@ -128,7 +127,7 @@ void RspTargetWriter::Run() {

     

       16
       16
       +
                    other_files.push_back(source);

     

       17
       17
       +
                  continue;  // No output for this source.

     

       18
       18
       +
                }

     

       19
       19
       +
       -        object_files.push_back(

     

       20
       20
       +
       +        object_files.insert(

     

       21
       21
       +
                    tool_outputs[0].AsSourceFile(settings->build_settings()));

     

       22
       22
       +
              }

     

       23
       23
       +
              if (target_->config_values().has_precompiled_headers()) {

     

       24
       24
       +
       @@ -137,7 +136,7 @@ void RspTargetWriter::Run() {

     

       25
       25
       +
                if (tool_cxx && tool_cxx->precompiled_header_type() == CTool::PCH_MSVC) {

     

       26
       26
       +
                  GetPCHOutputFiles(target_, CTool::kCToolCxx, &tool_outputs);

     

       27
       27
       +
                  if (!tool_outputs.empty())

     

       28
       28
       +
       -            object_files.push_back(

     

       29
       29
       +
       +            object_files.insert(

     

       30
       30
       +
                        tool_outputs[0].AsSourceFile(settings->build_settings()));

     

       31
       31
       +
                }

     

       32
       32
       +
              }