commit e0b1288ebd2c8e7264ab27581b33c790fb9f30b9 · pyrox.dev/nixpkgs

+5 -3

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

···

       76
       76
        
             qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};

     

       77
       77
        
             qtimageformats = callPackage ./qtimageformats.nix {};

     

       78
       78
        
             qtlocation = callPackage ./qtlocation.nix {};

     

       79
       79
       +
             qtmacextras = callPackage ./qtmacextras.nix {};

     

       79
       80
        
             qtmultimedia = callPackage ./qtmultimedia.nix {

     

       80
       81
        
               inherit gstreamer gst-plugins-base;

     

       81
       82
        
             };

     
···

       97
       98
        
             qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};

     

       98
       99
        
       

     

       99
       100
        
             env = callPackage ../qt-env.nix {};

     

       100
       100
       -
             full = env "qt-${qtbase.version}" [

     

       101
       101
       +
             full = env "qt-${qtbase.version}" ([

     

       101
       102
        
               qtconnectivity qtdeclarative qtdoc qtgraphicaleffects

     

       102
       103
        
               qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript

     

       103
       103
       -
               qtsensors qtserialport qtsvg qttools qttranslations qtwayland

     

       104
       104
       +
               qtsensors qtserialport qtsvg qttools qttranslations

     

       104
       105
        
               qtwebsockets qtx11extras qtxmlpatterns

     

       105
       105
       -
             ];

     

       106
       106
       +
             ] ++ optional (!stdenv.isDarwin) qtwayland

     

       107
       107
       +
               ++ optional (stdenv.isDarwin) qtmacextras);

     

       106
       108
        
       

     

       107
       109
        
             makeQtWrapper =

     

       108
       110
        
               makeSetupHook

+4 -2

pkgs/development/libraries/qt-5/5.8/qtbase/default.nix

···

       211
       211
        
           libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil

     

       212
       212
        
           xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm

     

       213
       213
        
         ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

     

       214
       214
       -
           ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa

     

       215
       215
       -
           DiskArbitration darwin.cf-private libiconv

     

       214
       214
       +
           AGL AppKit ApplicationServices Carbon Cocoa

     

       215
       215
       +
           CoreAudio CoreBluetooth CoreLocation CoreServices

     

       216
       216
       +
           DiskArbitration Foundation OpenGL

     

       217
       217
       +
           darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv

     

       216
       218
        
         ]);

     

       217
       219
        
       

     

       218
       220
        
         buildInputs = [ ]

+13 -3

pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix

···

       1
       1
       -
       { qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:

     

       1
       1
       +
       { stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       2
       4
        
       

     

       3
       5
        
       qtSubmodule {

     

       4
       6
        
         name = "qtdeclarative";

     

       5
       5
       -
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       7
       7
       +
         patches = copyPathsToStore (readPathsFromFile ./. ./series);

     

       6
       8
        
         qtInputs = [ qtbase qtsvg qtxmlpatterns ];

     

       7
       7
       -
         nativeBuildInputs = [ python2 ];

     

       9
       9
       +
         nativeBuildInputs = [ python2 makeQtWrapper ];

     

       10
       10
       +
       

     

       11
       11
       +
         postInstall = ''

     

       12
       12
       +
           wrapQtProgram $out/bin/qmleasing

     

       13
       13
       +
           wrapQtProgram $out/bin/qmlscene

     

       14
       14
       +
           wrapQtProgram $out/bin/qmltestrunner

     

       15
       15
       +
         '' + optionalString (stdenv.isDarwin) ''

     

       16
       16
       +
           wrapQtProgram $out/bin/qml.app/Contents/MacOS/qml

     

       17
       17
       +
         '';

     

       8
       18
        
       }

+10

pkgs/development/libraries/qt-5/5.8/qtmacextras.nix

···

       1
       1
       +
       { qtSubmodule, qtbase, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       qtSubmodule {

     

       4
       4
       +
         name = "qtmacextras";

     

       5
       5
       +
         qtInputs = [ qtbase ];

     

       6
       6
       +
         meta = with lib; {

     

       7
       7
       +
           maintainers = with maintainers; [ periklis ];

     

       8
       8
       +
           platforms = platforms.darwin;

     

       9
       9
       +
         };

     

       10
       10
       +
       }

+7 -4

pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix

···

       1
       1
       -
       { qtSubmodule, qtbase, qtdeclarative, pkgconfig

     

       1
       1
       +
       { stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig

     

       2
       2
        
       , alsaLib, gstreamer, gst-plugins-base, libpulseaudio

     

       3
       3
       +
       , darwin

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       6
       6
       +
       with stdenv.lib;

     

       7
       7
       +
       

     

       5
       8
        
       qtSubmodule {

     

       6
       9
        
         name = "qtmultimedia";

     

       7
       10
        
         qtInputs = [ qtbase qtdeclarative ];

     

       8
       8
       -
         buildInputs = [

     

       9
       9
       -
           pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio

     

       10
       10
       -
         ];

     

       11
       11
       +
         buildInputs = [ pkgconfig gstreamer gst-plugins-base libpulseaudio]

     

       12
       12
       +
           ++ optional (stdenv.isLinux) alsaLib;

     

       11
       13
        
         qmakeFlags = [ "GST_VERSION=1.0" ];

     

       14
       14
       +
         NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";

     

       12
       15
        
       }

+3 -1

pkgs/development/libraries/qt-5/5.8/qtsensors.nix

···

       1
       1
       -
       { qtSubmodule, qtbase, qtdeclarative }:

     

       1
       1
       +
       { stdenv, qtSubmodule, qtbase, qtdeclarative }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       2
       4
        
       

     

       3
       5
        
       qtSubmodule {

     

       4
       6
        
         name = "qtsensors";

+4 -2

pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix

···

       1
       1
       -
       { qtSubmodule, qtbase, substituteAll, systemd }:

     

       1
       1
       +
       { stdenv, qtSubmodule, qtbase, substituteAll, systemd }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       2
       4
        
       

     

       3
       5
        
       qtSubmodule {

     

       4
       6
        
         name = "qtserialport";

     

       5
       7
        
         qtInputs = [ qtbase ];

     

       6
       6
       -
         patches = [

     

       8
       8
       +
         patches = optionals (stdenv.isLinux) [

     

       7
       9
        
           (substituteAll {

     

       8
       10
        
             src = ./0001-dlopen-serialport-udev.patch;

     

       9
       11
        
             libudev = systemd.lib;

+19 -2

pkgs/development/libraries/qt-5/5.8/qttools/default.nix

···

       1
       1
       -
       { qtSubmodule, lib, copyPathsToStore, qtbase }:

     

       1
       1
       +
       { stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, qtbase }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       2
       4
        
       

     

       3
       5
        
       qtSubmodule {

     

       4
       6
        
         name = "qttools";

     

       5
       7
        
         qtInputs = [ qtbase ];

     

       6
       6
       -
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       8
       8
       +
         nativeBuildInputs = [ makeQtWrapper ];

     

       9
       9
       +
       

     

       10
       10
       +
         patches = copyPathsToStore (readPathsFromFile ./. ./series);

     

       7
       11
        
         postFixup = ''

     

       8
       12
        
           moveToOutput "bin/qdbus" "$out"

     

       9
       13
        
           moveToOutput "bin/qtpaths" "$out"

     

       14
       14
       +
         '';

     

       15
       15
       +
       

     

       16
       16
       +
         postInstall =   ''

     

       17
       17
       +
           wrapQtProgram $out/bin/qcollectiongenerator

     

       18
       18
       +
           wrapQtProgram $out/bin/qhelpconverter

     

       19
       19
       +
           wrapQtProgram $out/bin/qhelpgenerator

     

       20
       20
       +
           wrapQtProgram $out/bin/qtdiag

     

       21
       21
       +
         '' + optionalString (stdenv.isDarwin) ''

     

       22
       22
       +
           wrapQtProgram $out/bin/Assistant.app/Contents/MacOS/Assistant

     

       23
       23
       +
           wrapQtProgram $out/bin/Designer.app/Contents/MacOS/Designer

     

       24
       24
       +
           wrapQtProgram $out/bin/Linguist.app/Contents/MacOS/Linguist

     

       25
       25
       +
           wrapQtProgram $out/bin/pixeltool.app/Contents/MacOS/pixeltool

     

       26
       26
       +
           wrapQtProgram $out/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer

     

       10
       27
        
         '';

     

       11
       28
        
       }

+19 -10

pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix

···

       17
       17
        
       , lib, stdenv # lib.optional, needsPax

     

       18
       18
        
       }:

     

       19
       19
        
       

     

       20
       20
       +
       with stdenv.lib;

     

       21
       21
       +
       

     

       20
       22
        
       qtSubmodule {

     

       21
       23
        
         name = "qtwebengine";

     

       22
       24
        
         qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];

     
···

       41
       43
        
             -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \

     

       42
       44
        
             -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \

     

       43
       45
        
             src/core/web_engine_library_info.cpp

     

       44
       44
       -
       

     

       46
       46
       +
        '' + optionalString (!stdenv.isDarwin) ''

     

       45
       47
        
           sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \

     

       46
       48
        
             src/3rdparty/chromium/device/udev_linux/udev?_loader.cc

     

       47
       49
        
       

     
···

       49
       51
        
             src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc

     

       50
       52
        
         '';

     

       51
       53
        
       

     

       52
       52
       -
         qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";

     

       54
       54
       +
         qmakeFlags = optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";

     

       53
       55
        
       

     

       54
       56
        
         propagatedBuildInputs = [

     

       55
       55
       -
           dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent

     

       56
       56
       -
       

     

       57
       57
        
           # Image formats

     

       58
       58
        
           libjpeg libpng libtiff libwebp

     

       59
       59
        
       

     
···

       61
       61
        
           srtp libvpx

     

       62
       62
        
       

     

       63
       63
        
           # Audio formats

     

       64
       64
       -
           alsaLib libopus

     

       64
       64
       +
           libopus

     

       65
       65
       +
       

     

       66
       66
       +
           # Text rendering

     

       67
       67
       +
           harfbuzz icu

     

       68
       68
       +
         ]

     

       69
       69
       +
         ++ optionals (!stdenv.isDarwin) [

     

       70
       70
       +
           dbus zlib minizip snappy nss protobuf jsoncpp libevent

     

       71
       71
       +
       

     

       72
       72
       +
           # Audio formats

     

       73
       73
       +
           alsaLib

     

       65
       74
        
       

     

       66
       75
        
           # Text rendering

     

       67
       67
       -
           fontconfig freetype harfbuzz icu

     

       76
       76
       +
           fontconfig freetype

     

       77
       77
       +
       

     

       78
       78
       +
           libcap

     

       79
       79
       +
           pciutils

     

       68
       80
        
       

     

       69
       81
        
           # X11 libs

     

       70
       82
        
           xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst

     

       71
       83
        
           xlibs.libXcomposite

     

       72
       72
       -
       

     

       73
       73
       -
           libcap

     

       74
       74
       -
           pciutils

     

       75
       84
        
         ];

     

       76
       76
       -
         patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;

     

       85
       85
       +
         patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;

     

       77
       86
        
         postInstall = ''

     

       78
       87
        
           cat > $out/libexec/qt.conf <<EOF

     

       79
       88
        
           [Paths]

+11

pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch

···

       1
       1
       +
       --- qtwebkit-opensource-src-5.8.0.orig/Source/WTF/WTF.pri

     

       2
       2
       +
       +++ qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri

     

       3
       3
       +
       @@ -12,7 +12,7 @@

     

       4
       4
       +
            # Mac OS does ship libicu but not the associated header files.

     

       5
       5
       +
            # Therefore WebKit provides adequate header files.

     

       6
       6
       +
            INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH

     

       7
       7
       +
       -    LIBS += -licucore

     

       8
       8
       +
       +    LIBS += /usr/lib/libicucore.dylib

     

       9
       9
       +
        } else:!use?(wchar_unicode): {

     

       10
       10
       +
            win32 {

     

       11
       11
       +
                CONFIG(static, static|shared) {

+11 -3

pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix

···

       2
       2
        
       , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt

     

       3
       3
        
       , sqlite, systemd, glib, gst_all_1

     

       4
       4
        
       , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby

     

       5
       5
       +
       , darwin

     

       5
       6
        
       , substituteAll

     

       6
       7
        
       , flashplayerFix ? false

     

       7
       8
        
       }:

     
···

       11
       12
        
       qtSubmodule {

     

       12
       13
        
         name = "qtwebkit";

     

       13
       14
        
         qtInputs = [ qtdeclarative qtlocation qtsensors ];

     

       14
       14
       -
         buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];

     

       15
       15
       +
         buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]

     

       16
       16
       +
           ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]);

     

       15
       17
        
         nativeBuildInputs = [

     

       16
       18
        
           bison2 flex gdb gperf perl pkgconfig python2 ruby

     

       17
       19
        
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         __impureHostDeps = optionals (stdenv.isDarwin) [

     

       22
       22
       +
           "/usr/lib/libicucore.dylib"

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       18
       25
        
         patches =

     

       19
       26
        
           let dlopen-webkit-nsplugin = substituteAll {

     

       20
       27
        
                 src = ./0001-dlopen-webkit-nsplugin.patch;

     
···

       30
       37
        
                 libudev = systemd.lib;

     

       31
       38
        
               };

     

       32
       39
        
           in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]

     

       33
       33
       -
           ++ [ dlopen-webkit-udev ];

     

       34
       34
       -
         meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];

     

       40
       40
       +
           ++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ]

     

       41
       41
       +
           ++ optionals (stdenv.isDarwin) [ ./0004-icucore-darwin.patch ];

     

       42
       42
       +
         meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];

     

       35
       43
        
       }