commit b76a15fe76323dc42c760d7d472b039e1c923dbb · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/desktop-managers/plasma6.nix

···

       183
       183
        
             ++ lib.optionals config.services.desktopManager.plasma6.enableQt5Integration [

     

       184
       184
        
               breeze.qt5

     

       185
       185
        
               plasma-integration.qt5

     

       186
       186
       -
               pkgs.plasma5Packages.kwayland-integration

     

       186
       186
       +
               kwayland-integration

     

       187
       187
        
               (

     

       188
       188
        
                 # Only symlink the KIO plugins, so we don't accidentally pull any services

     

       189
       189
        
                 # like KCMs or kcookiejar

+39 -4

pkgs/kde/plasma/kwayland-integration/default.nix

···

       1
       1
       -
       { mkKdeDerivation }:

     

       2
       2
       -
       mkKdeDerivation {

     

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         sources,

     

       4
       4
       +
       

     

       5
       5
       +
         cmake,

     

       6
       6
       +
         pkg-config,

     

       7
       7
       +
         libsForQt5,

     

       8
       8
       +
         wayland-scanner,

     

       9
       9
       +
       

     

       10
       10
       +
         plasma-wayland-protocols,

     

       11
       11
       +
         wayland,

     

       12
       12
       +
         wayland-protocols,

     

       13
       13
       +
       }:

     

       14
       14
       +
       # not mkKdeDerivation because this is Qt5 land

     

       15
       15
       +
       stdenv.mkDerivation rec {

     

       3
       16
        
         pname = "kwayland-integration";

     

       4
       4
       -
         # FIXME(qt5)

     

       5
       5
       -
         meta.broken = true;

     

       17
       17
       +
         inherit (sources.${pname}) version;

     

       18
       18
       +
       

     

       19
       19
       +
         src = sources.${pname};

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           cmake

     

       23
       23
       +
           pkg-config

     

       24
       24
       +
           libsForQt5.extra-cmake-modules

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         buildInputs = [

     

       28
       28
       +
           libsForQt5.qtbase

     

       29
       29
       +
           libsForQt5.qtwayland

     

       30
       30
       +
       

     

       31
       31
       +
           libsForQt5.kwayland

     

       32
       32
       +
           libsForQt5.kwindowsystem

     

       33
       33
       +
       

     

       34
       34
       +
           plasma-wayland-protocols

     

       35
       35
       +
           wayland

     

       36
       36
       +
           wayland-protocols

     

       37
       37
       +
           wayland-scanner

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         dontWrapQtApps = true;

     

       6
       41
        
       }