diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/plasma-5')
6 files changed, 27 insertions, 11 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix index 8ab4b60156c6..39299d8c83c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -36,7 +36,6 @@ let }; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; - qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {}; packages = self: with self; let @@ -83,7 +82,6 @@ let setupHook = args.setupHook or defaultSetupHook; meta = { - broken = lib.versionAtLeast qtbase.version "5.15"; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; @@ -131,6 +129,7 @@ let plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; plasma-vault = callPackage ./plasma-vault {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/discover.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/discover.nix index a859285e0789..ccfeaa4f63e3 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/discover.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/discover.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, utillinux, + appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux, qtquickcontrols2, karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels, knewstuff, kwindowsystem, kxmlgui, plasma-framework @@ -12,7 +12,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ # discount is needed for libmarkdown - appstream-qt discount flatpak fwupd ostree packagekit-qt pcre utillinux + appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux qtquickcontrols2 karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui plasma-framework diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix index 3f2e9be462d8..569da3c70349 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix @@ -2,11 +2,7 @@ mkDerivation { name = "kdecoration"; - meta = { - broken = builtins.compareVersions qtbase.version "5.12.0" < 0; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; - broken = true; } diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix index 78b6909f046d..e2fb0877ec86 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, @@ -37,6 +37,11 @@ mkDerivation { patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch + (fetchpatch { # included in >= 5.18.6 + name = "EGL_TEXTURE_Y_XUXV_WL.diff"; + url = "https://github.com/KDE/kwin/commit/2c76cc478.diff"; + sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy"; + }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 8ae48b21f7be..73e449a13624 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -4,7 +4,7 @@ boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, - xorgserver, utillinux, + xorgserver, util-linux, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras, @@ -39,7 +39,7 @@ mkDerivation { ''; CXXFLAGS = [ "-I${lib.getDev xorgserver}/include/xorg" - ''-DNIXPKGS_HWCLOCK=\"${lib.getBin utillinux}/sbin/hwclock\"'' + ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"'' ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/plasma-thunderbolt.nix new file mode 100644 index 000000000000..1bb79c327ebf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/plasma-thunderbolt.nix @@ -0,0 +1,16 @@ +{ mkDerivation +, extra-cmake-modules +, kcmutils +, kcoreaddons +, bolt +}: + +mkDerivation { + name = "plasma-thunderbolt"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcmutils + kcoreaddons + bolt + ]; +} |