commit 92d929c8845074da598bbf47ecea72d70b16998e · pyrox.dev/nixpkgs

+18 -18

nixos/modules/rename.nix

···

       115
       115
        
           (mkRemovedOptionModule [ "services" "iodined" "client" ] "")

     

       116
       116
        
       

     

       117
       117
        
           # Grsecurity

     

       118
       118
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "kernelPatch" ])

     

       119
       119
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "mode" ])

     

       120
       120
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "priority" ])

     

       121
       121
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "system" ])

     

       122
       122
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationConfig" ])

     

       123
       123
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "hardwareVirtualisation" ])

     

       124
       124
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationSoftware" ])

     

       125
       125
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "sysctl" ])

     

       126
       126
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootChmod" ])

     

       127
       127
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootCaps" ])

     

       128
       128
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyUSB" ])

     

       129
       129
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProc" ])

     

       130
       130
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProcWithGroup" ])

     

       131
       131
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "unrestrictProcGid" ])

     

       132
       132
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableRBAC" ])

     

       133
       133
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableSimultConnect" ])

     

       134
       134
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "verboseVersion" ])

     

       135
       135
       -
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "kernelExtraConfig" ])

     

       118
       118
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "kernelPatch" ] "")

     

       119
       119
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "mode" ] "")

     

       120
       120
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "priority" ] "")

     

       121
       121
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "system" ] "")

     

       122
       122
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationConfig" ] "")

     

       123
       123
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "hardwareVirtualisation" ] "")

     

       124
       124
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationSoftware" ] "")

     

       125
       125
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "sysctl" ] "")

     

       126
       126
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootChmod" ] "")

     

       127
       127
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootCaps" ] "")

     

       128
       128
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyUSB" ] "")

     

       129
       129
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProc" ] "")

     

       130
       130
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProcWithGroup" ] "")

     

       131
       131
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "unrestrictProcGid" ] "")

     

       132
       132
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableRBAC" ] "")

     

       133
       133
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableSimultConnect" ] "")

     

       134
       134
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "verboseVersion" ] "")

     

       135
       135
       +
           (mkRemovedOptionModule [ "security" "grsecurity" "config" "kernelExtraConfig" ] "")

     

       136
       136
        
       

     

       137
       137
        
           # Unity3D

     

       138
       138
        
           (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])

+32

pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, pkgconfig, extra-cmake-modules, qtbase }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         pname = "kdevelop-pg-qt";

     

       5
       5
       +
         version = "2.0";

     

       6
       6
       +
         dirVersion = "2.0.0";

     

       7
       7
       +
       

     

       8
       8
       +
       in

     

       9
       9
       +
       stdenv.mkDerivation rec {

     

       10
       10
       +
         name = "${pname}-${version}";

     

       11
       11
       +
         

     

       12
       12
       +
         src = fetchurl {

     

       13
       13
       +
           url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";

     

       14
       14
       +
           sha256 = "2f778d324b7c0962e8bb5f62dd2643bac1a6f3ac971d145b6aace7cd61878993";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];

     

       18
       18
       +
         

     

       19
       19
       +
         buildInputs = [ qtbase ];

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with stdenv.lib; {

     

       22
       22
       +
           maintainers = [ maintainers.ambrop72 ];

     

       23
       23
       +
           platforms = platforms.linux;

     

       24
       24
       +
           description = "Parser-generator from KDevplatform";

     

       25
       25
       +
           longDescription = ''

     

       26
       26
       +
             KDevelop-PG-Qt is the parser-generator from KDevplatform.

     

       27
       27
       +
             It is used for some KDevelop-languagesupport-plugins (Ruby, PHP, CSS...).

     

       28
       28
       +
           '';

     

       29
       29
       +
           homepage = https://www.kdevelop.org;

     

       30
       30
       +
           license = with stdenv.lib.licenses; [ lgpl2Plus ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+54

pkgs/applications/editors/kdevelop5/kdevelop.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper

     

       2
       2
       +
       , qtquickcontrols, qtwebkit

     

       3
       3
       +
       , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews

     

       4
       4
       +
       , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor

     

       5
       5
       +
       , threadweaver, kxmlgui, kwindowsystem

     

       6
       6
       +
       , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info

     

       7
       7
       +
       , libksysguard, llvmPackages

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       let

     

       11
       11
       +
         pname = "kdevelop";

     

       12
       12
       +
         version = "5.0";

     

       13
       13
       +
         dirVersion = "5.0.0";

     

       14
       14
       +
       

     

       15
       15
       +
       in

     

       16
       16
       +
       stdenv.mkDerivation rec {

     

       17
       17
       +
         name = "${pname}-${version}";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchurl {

     

       20
       20
       +
           url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";

     

       21
       21
       +
           sha256 = "5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];

     

       25
       25
       +
       

     

       26
       26
       +
         buildInputs = [

     

       27
       27
       +
           qtquickcontrols qtwebkit

     

       28
       28
       +
           kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews

     

       29
       29
       +
           kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor

     

       30
       30
       +
           threadweaver kxmlgui kwindowsystem plasma-framework krunner

     

       31
       31
       +
           kdevplatform kdevelop-pg-qt shared_mime_info libksysguard

     

       32
       32
       +
           llvmPackages.llvm llvmPackages.clang-unwrapped

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         postInstall = ''

     

       36
       36
       +
           wrapQtProgram "$out/bin/kdevelop"

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       39
       39
       +
         meta = with stdenv.lib; {

     

       40
       40
       +
           maintainers = [ maintainers.ambrop72 ];

     

       41
       41
       +
           platforms = platforms.linux;

     

       42
       42
       +
           description = "KDE official IDE";

     

       43
       43
       +
           longDescription =

     

       44
       44
       +
             ''

     

       45
       45
       +
               A free, opensource IDE (Integrated Development Environment)

     

       46
       46
       +
               for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a

     

       47
       47
       +
               feature-full, plugin extendable IDE for C/C++ and other

     

       48
       48
       +
               programing languages. It is based on KDevPlatform, KDE and Qt

     

       49
       49
       +
               libraries and is under development since 1998.

     

       50
       50
       +
             '';

     

       51
       51
       +
           homepage = https://www.kdevelop.org;

     

       52
       52
       +
           license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+44

pkgs/applications/editors/kdevelop5/kdevplatform.nix

···

       1
       1
       +
       { stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper

     

       2
       2
       +
       , boost, subversion, apr, aprutil

     

       3
       3
       +
       , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n

     

       4
       4
       +
       , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications

     

       5
       5
       +
       , knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         pname = "kdevplatform";

     

       9
       9
       +
         version = "5.0";

     

       10
       10
       +
         dirVersion = "5.0.0";

     

       11
       11
       +
       

     

       12
       12
       +
       in

     

       13
       13
       +
       stdenv.mkDerivation rec {

     

       14
       14
       +
         name = "${pname}-${version}";

     

       15
       15
       +
         

     

       16
       16
       +
         src = fetchurl {

     

       17
       17
       +
           url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";

     

       18
       18
       +
           sha256 = "4085b355ab8d599d902afbc11027e1aefb22afe30d63ed54ea5fe02f24edfd10";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [ ];

     

       24
       24
       +
         buildInputs = [

     

       25
       25
       +
           boost subversion apr aprutil

     

       26
       26
       +
           qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes

     

       27
       27
       +
           ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff

     

       28
       28
       +
           knotifications knotifyconfig ktexteditor threadweaver kdeclarative

     

       29
       29
       +
           libkomparediff2

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with stdenv.lib; {

     

       33
       33
       +
           maintainers = [ maintainers.ambrop72 ];

     

       34
       34
       +
           platforms = platforms.linux;

     

       35
       35
       +
           description = "KDE libraries for IDE-like programs";

     

       36
       36
       +
           longDescription = ''

     

       37
       37
       +
             A free, opensource set of libraries that can be used as a foundation for

     

       38
       38
       +
             IDE-like programs. It is programing-language independent, and is planned

     

       39
       39
       +
             to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."

     

       40
       40
       +
           '';

     

       41
       41
       +
           homepage = https://www.kdevelop.org;

     

       42
       42
       +
           license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+3 -3

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

···

       92
       92
        
             qtsvg = callPackage ./qtsvg.nix {};

     

       93
       93
        
             qttools = callPackage ./qttools {};

     

       94
       94
        
             qttranslations = callPackage ./qttranslations.nix {};

     

       95
       95
       -
             /* qtwayland = not packaged */

     

       95
       95
       +
             qtwayland = callPackage ./qtwayland.nix {};

     

       96
       96
        
             qtwebchannel = callPackage ./qtwebchannel.nix {};

     

       97
       97
        
             qtwebengine = callPackage ./qtwebengine.nix {};

     

       98
       98
        
             qtwebkit = callPackage ./qtwebkit {};

     
···

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

     

       106
       106
        
               qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects

     

       107
       107
        
               qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript

     

       108
       108
       -
               qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets

     

       109
       109
       -
               qtx11extras qtxmlpatterns

     

       108
       108
       +
               qtsensors qtserialport qtsvg qttools qttranslations qtwayland

     

       109
       109
       +
               qtwebsockets qtx11extras qtxmlpatterns

     

       110
       110
        
             ];

     

       111
       111
        
       

     

       112
       112
        
             makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;

+91 -27

pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch

···

       1
       1
       -
       Index: qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       1
       1
       +
       Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       2
       2
        
       ===================================================================

     

       3
       3
       -
       --- qtbase-opensource-src-5.6.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       4
       4
       -
       +++ qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       3
       3
       +
       --- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       4
       4
       +
       +++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       5
       5
        
       @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)

     

       6
       6
        
        endif()

     

       7
       7
        
        !!ENDIF

     
···

       173
       173
        
            endif()

     

       174
       174
        
        !!ENDIF // CMAKE_RELEASE_TYPE

     

       175
       175
        
        !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD

     

       176
       176
       -
       @@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       176
       176
       +
       @@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       177
       177
       +
            macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)

     

       177
       178
        
                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       178
       179
        
        

     

       179
       179
       -
        !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       180
       180
       +
       -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       180
       181
        
       -        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       181
       181
       -
       +        set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       -
        !!ELSE

     

       183
       183
       -
                set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       -
        !!ENDIF

     

       185
       185
       -
       Index: qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       182
       182
       +
       -!!ELSE

     

       183
       183
       +
       -        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       +
       -!!ENDIF

     

       185
       185
       +
       +        set(imported_location \"${PLUGIN_LOCATION}\")

     

       186
       186
       +
                _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})

     

       187
       187
       +
                set_target_properties(Qt5::${Plugin} PROPERTIES

     

       188
       188
       +
                    \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}

     

       189
       189
       +
       Index: qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in

     

       186
       190
        
       ===================================================================

     

       187
       187
       -
       --- qtbase-opensource-src-5.6.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in

     

       188
       188
       -
       +++ qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       191
       191
       +
       --- qtbase-opensource-src-5.6.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in

     

       192
       192
       +
       +++ qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in

     

       189
       193
        
       @@ -2,7 +2,7 @@

     

       190
       194
        
        !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)

     

       191
       195
        
        

     
···

       211
       215
        
        !!ELSE

     

       212
       216
        
            set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       213
       217
        
        !!ENDIF

     

       214
       214
       -
       Index: qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       218
       218
       +
       Index: qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       215
       219
        
       ===================================================================

     

       216
       216
       -
       --- qtbase-opensource-src-5.6.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       217
       217
       -
       +++ qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       220
       220
       +
       --- qtbase-opensource-src-5.6.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       221
       221
       +
       +++ qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       218
       222
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)

     

       219
       223
        
            add_executable(Qt5::uic IMPORTED)

     

       220
       224
        
        

     
···

       224
       228
        
        !!ELSE

     

       225
       229
        
            set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")

     

       226
       230
        
        !!ENDIF

     

       227
       227
       -
       Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       231
       231
       +
       Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       228
       232
        
       ===================================================================

     

       229
       229
       -
       --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       230
       230
       -
       +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       233
       233
       +
       --- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       234
       234
       +
       +++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       231
       235
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)

     

       232
       236
        
            add_executable(Qt5::qmake IMPORTED)

     

       233
       237
        
        

     
···

       273
       277
        
        !!ELSE

     

       274
       278
        
            set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")

     

       275
       279
        
        !!ENDIF

     

       276
       276
       -
       Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       280
       280
       +
       Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       277
       281
        
       ===================================================================

     

       278
       278
       -
       --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       279
       279
       -
       +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       282
       282
       +
       --- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       283
       283
       +
       +++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       280
       284
        
       @@ -1,6 +1,6 @@

     

       281
       285
        
        

     

       282
       286
        
        !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)

     
···

       285
       289
        
        !!ELSE

     

       286
       290
        
        set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       287
       291
        
        !!ENDIF

     

       288
       288
       -
       Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       292
       292
       +
       Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       289
       293
        
       ===================================================================

     

       290
       290
       -
       --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       291
       291
       -
       +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       294
       294
       +
       --- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       295
       295
       +
       +++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       292
       296
        
       @@ -1,6 +1,6 @@

     

       293
       297
        
        

     

       294
       298
        
        !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)

     
···

       297
       301
        
        !!ELSE

     

       298
       302
        
        set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       299
       303
        
        !!ENDIF

     

       300
       300
       -
       Index: qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       304
       304
       +
       Index: qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       301
       305
        
       ===================================================================

     

       302
       302
       -
       --- qtbase-opensource-src-5.6.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       303
       303
       -
       +++ qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       306
       306
       +
       --- qtbase-opensource-src-5.6.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       307
       307
       +
       +++ qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       304
       308
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)

     

       305
       309
        
            add_executable(Qt5::qdbuscpp2xml IMPORTED)

     

       306
       310
        
        

     
···

       319
       323
        
        !!ELSE

     

       320
       324
        
            set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       321
       325
        
        !!ENDIF

     

       326
       326
       +
       Index: qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf

     

       327
       327
       +
       ===================================================================

     

       328
       328
       +
       --- qtbase-opensource-src-5.6.1.orig/mkspecs/features/create_cmake.prf

     

       329
       329
       +
       +++ qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf

     

       330
       330
       +
       @@ -136,28 +136,28 @@ contains(CONFIG, plugin) {

     

       331
       331
       +
        

     

       332
       332
       +
            win32 {

     

       333
       333
       +
                isEmpty(CMAKE_STATIC_TYPE) {

     

       334
       334
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll

     

       335
       335
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll

     

       336
       336
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll

     

       337
       337
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll

     

       338
       338
       +
                } else:mingw {

     

       339
       339
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a

     

       340
       340
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a

     

       341
       341
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a

     

       342
       342
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a

     

       343
       343
       +
                } else {                         # MSVC static

     

       344
       344
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib

     

       345
       345
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib

     

       346
       346
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib

     

       347
       347
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib

     

       348
       348
       +
                }

     

       349
       349
       +
            } else {

     

       350
       350
       +
                mac {

     

       351
       351
       +
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib

     

       352
       352
       +
                    else: CMAKE_PlUGIN_EXT = .a

     

       353
       353
       +
        

     

       354
       354
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       355
       355
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       356
       356
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       357
       357
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       358
       358
       +
                } else {

     

       359
       359
       +
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so

     

       360
       360
       +
                    else: CMAKE_PlUGIN_EXT = .a

     

       361
       361
       +
        

     

       362
       362
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       363
       363
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       364
       364
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       365
       365
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       366
       366
       +
                }

     

       367
       367
       +
            }

     

       368
       368
       +
            cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in

     

       369
       369
       +
       Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       370
       370
       +
       ===================================================================

     

       371
       371
       +
       --- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       372
       372
       +
       +++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       373
       373
       +
       @@ -2,10 +2,10 @@

     

       374
       374
       +
        add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)

     

       375
       375
       +
        

     

       376
       376
       +
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       377
       377
       +
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       378
       378
       +
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       379
       379
       +
        !!ENDIF

     

       380
       380
       +
        !!IF !isEmpty(CMAKE_DEBUG_TYPE)

     

       381
       381
       +
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       382
       382
       +
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       383
       383
       +
        !!ENDIF

     

       384
       384
       +
        

     

       385
       385
       +
        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)

+4 -4

pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch

···

       1
       1
       -
       Index: qtbase-opensource-src-5.5.1/src/dbus/qdbus_symbols.cpp

     

       1
       1
       +
       Index: qtbase-opensource-src-5.6.1/src/dbus/qdbus_symbols.cpp

     

       2
       2
        
       ===================================================================

     

       3
       3
       -
       --- qtbase-opensource-src-5.5.1.orig/src/dbus/qdbus_symbols.cpp

     

       4
       4
       -
       +++ qtbase-opensource-src-5.5.1/src/dbus/qdbus_symbols.cpp

     

       5
       5
       -
       @@ -89,7 +89,7 @@ bool qdbus_loadLibDBus()

     

       3
       3
       +
       --- qtbase-opensource-src-5.6.1.orig/src/dbus/qdbus_symbols.cpp

     

       4
       4
       +
       +++ qtbase-opensource-src-5.6.1/src/dbus/qdbus_symbols.cpp

     

       5
       5
       +
       @@ -90,7 +90,7 @@ bool qdbus_loadLibDBus()

     

       6
       6
        
        #ifdef Q_OS_WIN

     

       7
       7
        
                QLatin1String("dbus-1"),

     

       8
       8
        
        #endif

+10 -10

pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch

···

       1
       1
       -
       Index: qtbase-opensource-src-5.6.0/src/network/kernel/qdnslookup_unix.cpp

     

       1
       1
       +
       Index: qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp

     

       2
       2
        
       ===================================================================

     

       3
       3
       -
       --- qtbase-opensource-src-5.6.0.orig/src/network/kernel/qdnslookup_unix.cpp

     

       4
       4
       -
       +++ qtbase-opensource-src-5.6.0/src/network/kernel/qdnslookup_unix.cpp

     

       5
       5
       -
       @@ -79,7 +79,7 @@ static void resolveLibrary()

     

       3
       3
       +
       --- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qdnslookup_unix.cpp

     

       4
       4
       +
       +++ qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp

     

       5
       5
       +
       @@ -78,7 +78,7 @@ static bool resolveLibraryInternal()

     

       6
       6
        
            if (!lib.load())

     

       7
       7
        
        #endif

     

       8
       8
        
            {

     

       9
       9
        
       -        lib.setFileName(QLatin1String("resolv"));

     

       10
       10
        
       +        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));

     

       11
       11
        
                if (!lib.load())

     

       12
       12
       -
                    return;

     

       12
       12
       +
                    return false;

     

       13
       13
        
            }

     

       14
       14
       -
       Index: qtbase-opensource-src-5.6.0/src/network/kernel/qhostinfo_unix.cpp

     

       14
       14
       +
       Index: qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp

     

       15
       15
        
       ===================================================================

     

       16
       16
       -
       --- qtbase-opensource-src-5.6.0.orig/src/network/kernel/qhostinfo_unix.cpp

     

       17
       17
       -
       +++ qtbase-opensource-src-5.6.0/src/network/kernel/qhostinfo_unix.cpp

     

       18
       18
       -
       @@ -95,7 +95,7 @@ static void resolveLibrary()

     

       16
       16
       +
       --- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qhostinfo_unix.cpp

     

       17
       17
       +
       +++ qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp

     

       18
       18
       +
       @@ -94,7 +94,7 @@ static bool resolveLibraryInternal()

     

       19
       19
        
            if (!lib.load())

     

       20
       20
        
        #endif

     

       21
       21
        
            {

     

       22
       22
        
       -        lib.setFileName(QLatin1String("resolv"));

     

       23
       23
        
       +        lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));

     

       24
       24
        
                if (!lib.load())

     

       25
       25
       -
                    return;

     

       25
       25
       +
                    return false;

     

       26
       26
        
            }

pkgs/development/libraries/qt-5/5.6/qtwayland.nix

···

       1
       1
       +
       { qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }:

     

       2
       2
       +
       

     

       3
       3
       +
       qtSubmodule {

     

       4
       4
       +
         name = "qtwayland";

     

       5
       5
       +
         qtInputs = [ qtbase qtquickcontrols ];

     

       6
       6
       +
         buildInputs = [ wayland ];

     

       7
       7
       +
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
       +
       }

+3 -2

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

···

       88
       88
        
             qtsvg = callPackage ./qtsvg.nix {};

     

       89
       89
        
             qttools = callPackage ./qttools {};

     

       90
       90
        
             qttranslations = callPackage ./qttranslations.nix {};

     

       91
       91
       +
             qtwayland = callPackage ./qtwayland.nix {};

     

       91
       92
        
             qtwebchannel = callPackage ./qtwebchannel.nix {};

     

       92
       93
        
             qtwebengine = callPackage ./qtwebengine.nix {};

     

       93
       94
        
             qtwebkit = callPackage ./qtwebkit {};

     
···

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

     

       100
       101
        
               qtconnectivity qtdeclarative qtdoc qtgraphicaleffects

     

       101
       102
        
               qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript

     

       102
       102
       -
               qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets

     

       103
       103
       -
               qtx11extras qtxmlpatterns

     

       103
       103
       +
               qtsensors qtserialport qtsvg qttools qttranslations qtwayland

     

       104
       104
       +
               qtwebsockets qtx11extras qtxmlpatterns

     

       104
       105
        
             ];

     

       105
       106
        
       

     

       106
       107
        
             makeQtWrapper =

+70 -6

pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch

···

       173
       173
        
            endif()

     

       174
       174
        
        !!ENDIF // CMAKE_RELEASE_TYPE

     

       175
       175
        
        !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD

     

       176
       176
       -
       @@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       176
       176
       +
       @@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       177
       177
       +
            macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)

     

       177
       178
        
                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       178
       179
        
        

     

       179
       179
       -
        !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       180
       180
       +
       -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       180
       181
        
       -        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       181
       181
       -
       +        set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       -
        !!ELSE

     

       183
       183
       -
                set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       -
        !!ENDIF

     

       182
       182
       +
       -!!ELSE

     

       183
       183
       +
       -        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       +
       -!!ENDIF

     

       185
       185
       +
       +        set(imported_location \"${PLUGIN_LOCATION}\")

     

       186
       186
       +
                _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})

     

       187
       187
       +
                set_target_properties(Qt5::${Plugin} PROPERTIES

     

       188
       188
       +
                    \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}

     

       185
       189
        
       Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       186
       190
        
       ===================================================================

     

       187
       191
        
       --- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in

     
···

       319
       323
        
        !!ELSE

     

       320
       324
        
            set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       321
       325
        
        !!ENDIF

     

       326
       326
       +
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       327
       327
       +
       ===================================================================

     

       328
       328
       +
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf

     

       329
       329
       +
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       330
       330
       +
       @@ -136,28 +136,28 @@ contains(CONFIG, plugin) {

     

       331
       331
       +
        

     

       332
       332
       +
            win32 {

     

       333
       333
       +
                isEmpty(CMAKE_STATIC_TYPE) {

     

       334
       334
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll

     

       335
       335
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll

     

       336
       336
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll

     

       337
       337
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll

     

       338
       338
       +
                } else:mingw {

     

       339
       339
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a

     

       340
       340
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a

     

       341
       341
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a

     

       342
       342
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a

     

       343
       343
       +
                } else {                         # MSVC static

     

       344
       344
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib

     

       345
       345
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib

     

       346
       346
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib

     

       347
       347
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib

     

       348
       348
       +
                }

     

       349
       349
       +
            } else {

     

       350
       350
       +
                mac {

     

       351
       351
       +
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib

     

       352
       352
       +
                    else: CMAKE_PlUGIN_EXT = .a

     

       353
       353
       +
        

     

       354
       354
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       355
       355
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       356
       356
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       357
       357
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       358
       358
       +
                } else {

     

       359
       359
       +
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so

     

       360
       360
       +
                    else: CMAKE_PlUGIN_EXT = .a

     

       361
       361
       +
        

     

       362
       362
       +
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       363
       363
       +
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       364
       364
       +
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       365
       365
       +
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       366
       366
       +
                }

     

       367
       367
       +
            }

     

       368
       368
       +
            cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in

     

       369
       369
       +
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       370
       370
       +
       ===================================================================

     

       371
       371
       +
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       372
       372
       +
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       373
       373
       +
       @@ -2,10 +2,10 @@

     

       374
       374
       +
        add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)

     

       375
       375
       +
        

     

       376
       376
       +
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       377
       377
       +
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       378
       378
       +
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       379
       379
       +
        !!ENDIF

     

       380
       380
       +
        !!IF !isEmpty(CMAKE_DEBUG_TYPE)

     

       381
       381
       +
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       382
       382
       +
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       383
       383
       +
        !!ENDIF

     

       384
       384
       +
        

     

       385
       385
       +
        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)

pkgs/development/libraries/qt-5/5.7/qtwayland.nix

···

       1
       1
       +
       { qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }:

     

       2
       2
       +
       

     

       3
       3
       +
       qtSubmodule {

     

       4
       4
       +
         name = "qtwayland";

     

       5
       5
       +
         qtInputs = [ qtbase qtquickcontrols ];

     

       6
       6
       +
         buildInputs = [ wayland ];

     

       7
       7
       +
         nativeBuildInputs = [ pkgconfig ];

     

       8
       8
       +
       }

pkgs/top-level/all-packages.nix

···

       13658
       13658
        
       

     

       13659
       13659
        
         kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { };

     

       13660
       13660
        
       

     

       13661
       13661
       +
         kdevelop-pg-qt = kde5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};

     

       13662
       13662
       +
       

     

       13663
       13663
       +
         kdevelop = kde5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {

     

       13664
       13664
       +
           llvmPackages = llvmPackages_38;

     

       13665
       13665
       +
         };

     

       13666
       13666
       +
       

     

       13667
       13667
       +
         kdevplatform = kde5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {};

     

       13668
       13668
       +
       

     

       13661
       13669
        
         keepnote = callPackage ../applications/office/keepnote {

     

       13662
       13670
        
           pygtk = pyGtkGlade;

     

       13663
       13671
        
         };