Merge pull request #33930 from bkchr/fix_kinit

kinit: Fixes build
This commit is contained in:
adisbladis 2018-01-16 19:48:41 +08:00 committed by GitHub
commit df4746d2b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,10 +14,10 @@ mkDerivation {
kconfig kcrash ki18n kio kservice kwindowsystem kconfig kcrash ki18n kio kservice kwindowsystem
]; ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
NIX_CFLAGS_COMPILE = [ CXXFLAGS = [
''-DNIXPKGS_KF5_KIOCORE="${getLib kio}/lib/libKF5KIOCore.so.5"'' ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"''
''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"'' ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"''
''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"'' ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"''
]; ];
postFixup = '' postFixup = ''
moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin" moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin"