diff --git a/flake.lock b/flake.lock index 2114858a..a9c40e94 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1702629192, - "narHash": "sha256-uwZUoDwjnKPjkrJHbKNS6kHnqRt2ZOET8g52Mn94deA=", + "lastModified": 1704186089, + "narHash": "sha256-KaISAWukWL3onGJ1axf4wzEqNRmxhLF3gDVfUqa0BGo=", "owner": "linuxdeepin", "repo": "dde-nixos", - "rev": "446a1687b89ca5f38a34c3a6ec8d6b6df1146b2d", + "rev": "ea7e788adeb93282062bf915c5c6f65dcc38b135", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "qwlroots": "qwlroots" }, "locked": { - "lastModified": 1703050355, - "narHash": "sha256-8GBOv3oumddOhVDAaRk2pGA6fnTmD/CvPlgj3b0V3ts=", + "lastModified": 1704181958, + "narHash": "sha256-9NI/AB5hZgpqmheTSGBK59C9yakW+BGllGswA5fwJyY=", "owner": "vioken", "repo": "waylib", - "rev": "15a6274f624a493d2a0ce71edba00f7c5665e35a", + "rev": "60a11441a282b48a0acd98e7685546fb6207b60c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ee067d93..e7dcb319 100644 --- 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 index 86acce39..05b3cf54 100644 --- 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 = [