Merge pull request #185775 from NickCao/plasma-workspace

plasma-workspace: cleanup unused NIX_CFLAGS_COMPILE
This commit is contained in:
Thomas Tuegel 2022-09-20 12:40:15 -05:00 committed by GitHub
commit a21661c716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,8 +3,8 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, coreutils, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
libXtst, libXft, pam, wayland, xmessage, xprop, xrdb, xsetroot, libXtst, libXft, pam, wayland, xmessage, xsetroot,
baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash,
kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime,
@ -62,10 +62,7 @@ mkDerivation {
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''
''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"''
''-DNIXPKGS_XPROP="${getBin xprop}/bin/xprop"''
''-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT="${getBin dbus}/bin/dbus-update-activation-environment"''
''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"'' ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"''
''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"'' ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"''
]; ];