fix: build on nix ci

Log: fix build on nixos
linuxdeepin · Jan 2, 2024 · 3e6f4a1 · 3e6f4a1
1 parent b1fa8b1
commit 3e6f4a1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -26,7 +26,7 @@
           treeland = pkgs.qt6Packages.callPackage ./nix {
             nix-filter = nix-filter.lib;
             waylib = waylib.packages.${system}.default;
-            dtkdeclarative = dde-nixos.packages.${system}.qt6.dtkdeclarative;
+            inherit (dde-nixos.packages.${system}.qt6) dtkdeclarative dtksystemsettings;
           };
         in
         {

diff --git a/nix/default.nix b/nix/default.nix
@@ -12,12 +12,14 @@
 , qtquick3d
 , qtwayland
 , dtkdeclarative
+, dtksystemsettings
 , waylib
 , wayland
 , wayland-protocols
 , wlr-protocols
 , pixman
 , pam
+, libxcrypt
 , nixos-artwork
 }:
 
@@ -39,9 +41,12 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    substituteInPlace src/{treeland/quick/qml/OutputDelegate.qml,greeter/Greeter.qml} \
-      --replace "/usr/share/wallpapers/deepin/desktop.jpg" \
+    for file in $(grep -rl "/usr/share/wallpapers/deepin")
+    do
+      substituteInPlace $file \
+        --replace "/usr/share/wallpapers/deepin/desktop.jpg" \
                 "${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png"
+    done
   '';
 
   nativeBuildInputs = [
@@ -58,12 +63,14 @@ stdenv.mkDerivation rec {
     qtquick3d
     qtwayland
     dtkdeclarative
+    dtksystemsettings
     waylib
     wayland
     wayland-protocols
     wlr-protocols
     pixman
     pam
+    libxcrypt
   ];
 
    cmakeFlags = [