commit c978183c5df77db0c5b8a44942c821e4f96c28ef · pyrox.dev/nixpkgs

+29

pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index b8e729a..ebd3603 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -5,9 +5,7 @@ project(fcitx-qt5)

     

       6
       6
       +
        set(FcitxQt5_VERSION 1.0.0)

     

       7
       7
       +
        set(REQUIRED_QT_VERSION 5.1.0)

     

       8
       8
       +
        

     

       9
       9
       +
       -find_package(ECM 1.4.0 REQUIRED NO_MODULE)

     

       10
       10
       +
       -

     

       11
       11
       +
       -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

     

       12
       12
       +
       +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

     

       13
       13
       +
        

     

       14
       14
       +
        include(GNUInstallDirs)

     

       15
       15
       +
        include(FeatureSummary)

     

       16
       16
       +
       diff --git a/cmake/FindXKBCommon.cmake b/cmake/FindXKBCommon.cmake

     

       17
       17
       +
       index a645584..de0007d 100644

     

       18
       18
       +
       --- a/cmake/FindXKBCommon.cmake

     

       19
       19
       +
       +++ b/cmake/FindXKBCommon.cmake

     

       20
       20
       +
       @@ -1,5 +1,5 @@

     

       21
       21
       +
        

     

       22
       22
       +
       -include(ECMFindModuleHelpersStub)

     

       23
       23
       +
       +include(ECMFindModuleHelpers)

     

       24
       24
       +
        

     

       25
       25
       +
        ecm_find_package_version_check(XKBCommon)

     

       26
       26
       +
        

     

       27
       27
       +
       -- 

     

       28
       28
       +
       2.8.0

     

       29
       29
       +

+14 -2

pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix

···

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

     

       1
       1
       +
       { stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, kde5 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "fcitx-qt5-${version}";

     
···

       9
       9
        
           sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ cmake fcitx extra-cmake-modules qtbase ];

     

       12
       12
       +
         # The following is to not have a dependency on kde5 so the plugin can be part of qt5LibsFun

     

       13
       13
       +
         postUnpack = ''

     

       14
       14
       +
           ${lib.concatMapStrings (f: ''

     

       15
       15
       +
             ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/${f} $sourceRoot/cmake/

     

       16
       16
       +
           '')

     

       17
       17
       +
           [ "ECMFindModuleHelpers.cmake" "ECMGenerateHeaders.cmake"

     

       18
       18
       +
             "ECMPackageConfigHelpers.cmake" "ECMQueryQmake.cmake"

     

       19
       19
       +
             "ECMSetupVersion.cmake" "ECMVersionHeader.h.in" ]}

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         patches = [ ./fcitx-qt5-ecm.patch ];

     

       23
       23
       +
       

     

       24
       24
       +
         buildInputs = [ cmake fcitx pkgconfig qtbase ];

     

       13
       25
        
       

     

       14
       26
        
         preInstall = ''

     

       15
       27
        
           substituteInPlace platforminputcontext/cmake_install.cmake \

+2 -2

pkgs/tools/inputmethods/fcitx/wrapper.nix

···

       1
       1
       -
       { stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:

     

       1
       1
       +
       { stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, qt55 }:

     

       2
       2
        
       

     

       3
       3
        
       symlinkJoin {

     

       4
       4
        
         name = "fcitx-with-plugins-${fcitx.version}";

     

       5
       5
        
       

     

       6
       6
       -
         paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ plugins;

     

       6
       6
       +
         paths = [ fcitx fcitx-configtool qt55.fcitx-qt5 ] ++ plugins;

     

       7
       7
        
       

     

       8
       8
        
         buildInputs = [ makeWrapper ];

     

       9
       9

+2 -2

pkgs/top-level/all-packages.nix

···

       8766
       8766
        
       

     

       8767
       8767
        
           accounts-qt = callPackage ../development/libraries/accounts-qt { };

     

       8768
       8768
        
       

     

       8769
       8769
       +
           fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };

     

       8770
       8770
       +
       

     

       8769
       8771
        
           grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };

     

       8770
       8772
        
       

     

       8771
       8773
        
           libcommuni = callPackage ../development/libraries/libcommuni { };

     
···

       15737
       15739
        
           colord-kde = callPackage ../tools/misc/colord-kde/0.5.nix {};

     

       15738
       15740
        
       

     

       15739
       15741
        
           dfilemanager = callPackage ../applications/misc/dfilemanager { };

     

       15740
       15740
       -
       

     

       15741
       15741
       -
           fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };

     

       15742
       15742
        
       

     

       15743
       15743
        
           k9copy = callPackage ../applications/video/k9copy {};

     

       15744
       15744