Merge master into staging-next

2021-03-24 00:41:10 +00:00
parent ca7fa2ef7b 9677d30d77
commit 2417360191
25 changed files with 539 additions and 261 deletions
@@ -53,9 +53,10 @@ mkDerivation {
    ./0002-absolute-wallpaper-install-dir.patch
  ];

+  # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools
  postPatch = ''
-    substituteInPlace wallpapers/image/wallpaper.knsrc.cmake \
-      --replace '@QtBinariesDir@/qdbus' ${getBin qttools}/bin/qdbus
+    substituteInPlace CMakeLists.txt \
+      --replace 'query_qmake(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")'
  '';

  NIX_CFLAGS_COMPILE = [