commit 3e3e3918f228a3a30cd216ba0572b18c12bca401 · pyrox.dev/nixpkgs

+2 -2

pkgs/development/libraries/qt-5/5.11/default.nix

···

       62
       62
        
           qtscript = [ ./qtscript.patch ];

     

       63
       63
        
           qtserialport = [ ./qtserialport.patch ];

     

       64
       64
        
           qttools = [ ./qttools.patch ];

     

       65
       65
       -
           qtwebengine =

     

       66
       66
       -
                optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch

     

       65
       65
       +
           qtwebengine = [ ./qtwebengine-no-build-skip.patch ]

     

       66
       66
       +
             ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch

     

       67
       67
        
             ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch;

     

       68
       68
        
           qtwebkit = [ ./qtwebkit.patch ];

     

       69
       69
        
         };

+12

pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch

···

       1
       1
       +
       diff --git a/qtwebengine.pro b/qtwebengine.pro

     

       2
       2
       +
       --- a/qtwebengine.pro

     

       3
       3
       +
       +++ b/qtwebengine.pro

     

       4
       4
       +
       @@ -5,7 +5,7 @@ runConfigure()

     

       5
       5
       +
        

     

       6
       6
       +
        !isEmpty(skipBuildReason) {

     

       7
       7
       +
            SUBDIRS =

     

       8
       8
       +
       -    log($${skipBuildReason}$${EOL})

     

       9
       9
       +
       +    error($${skipBuildReason}$${EOL})

     

       10
       10
       +
            log(QtWebEngine will not be built.$${EOL})

     

       11
       11
       +
        }

     

       12
       12
       +

+1

pkgs/development/libraries/qt-5/5.12/default.nix

···

       60
       60
        
           qtdeclarative = [ ./qtdeclarative.patch ];

     

       61
       61
        
           qtscript = [ ./qtscript.patch ];

     

       62
       62
        
           qtserialport = [ ./qtserialport.patch ];

     

       63
       63
       +
           qtwebengine = [ ./qtwebengine-no-build-skip.patch ];

     

       63
       64
        
           qtwebkit = [ ./qtwebkit.patch ];

     

       64
       65
        
         };

     

       65
       66

+12

pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch

···

       1
       1
       +
       diff --git a/qtwebengine.pro b/qtwebengine.pro

     

       2
       2
       +
       --- a/qtwebengine.pro

     

       3
       3
       +
       +++ b/qtwebengine.pro

     

       4
       4
       +
       @@ -5,7 +5,7 @@ runConfigure()

     

       5
       5
       +
        

     

       6
       6
       +
        !isEmpty(skipBuildReason) {

     

       7
       7
       +
            SUBDIRS =

     

       8
       8
       +
       -    log($${skipBuildReason}$${EOL})

     

       9
       9
       +
       +    error($${skipBuildReason}$${EOL})

     

       10
       10
       +
            log(QtWebEngine will not be built.$${EOL})

     

       11
       11
       +
        }

     

       12
       12
       +

+1

pkgs/development/libraries/qt-5/5.9/default.nix

···

       43
       43
        
           qtscript = [ ./qtscript.patch ];

     

       44
       44
        
           qtserialport = [ ./qtserialport.patch ];

     

       45
       45
        
           qttools = [ ./qttools.patch ];

     

       46
       46
       +
           qtwebengine = [ ./qtwebengine-no-build-skip.patch ];

     

       46
       47
        
           qtwebkit = [ ./qtwebkit.patch ];

     

       47
       48
        
           qtvirtualkeyboard = [

     

       48
       49
        
             (fetchpatch {

+12

pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch

···

       1
       1
       +
       diff --git a/qtwebengine.pro b/qtwebengine.pro

     

       2
       2
       +
       --- a/qtwebengine.pro

     

       3
       3
       +
       +++ b/qtwebengine.pro

     

       4
       4
       +
       @@ -5,7 +5,7 @@ runConfigure()

     

       5
       5
       +
        

     

       6
       6
       +
        !isEmpty(skipBuildReason) {

     

       7
       7
       +
            SUBDIRS =

     

       8
       8
       +
       -    log($${skipBuildReason}$${EOL})

     

       9
       9
       +
       +    error($${skipBuildReason}$${EOL})

     

       10
       10
       +
            log(QtWebEngine will not be built.$${EOL})

     

       11
       11
       +
        }

     

       12
       12
       +