diff --git a/BUILD.md b/BUILD.md index 3172dbe3..afcb2e44 100644 --- a/BUILD.md +++ b/BUILD.md @@ -44,7 +44,7 @@ Quickshell has a set of base dependencies you will always need, names vary by di - `qtshadertools` (build-time only) - `spirv-tools` (build-time only) - `pkg-config` (build-time only) -- `cli11` +- `cli11` (build-time only) On some distros, private Qt headers are in separate packages which you may have to install. We currently require private headers for the following libraries: diff --git a/default.nix b/default.nix index 79c9b7a4..53c238ef 100644 --- a/default.nix +++ b/default.nix @@ -5,18 +5,20 @@ keepDebugInfo, buildStdenv ? pkgs.clangStdenv, + pkg-config, cmake, ninja, - qt6, spirv-tools, - cli11, + qt6, breakpad, jemalloc, + cli11, wayland, wayland-protocols, + wayland-scanner, + xorg, libdrm, libgbm ? null, - xorg, pipewire, pam, @@ -46,11 +48,12 @@ version = "0.1.0"; src = nix-gitignore.gitignoreSource "/docs\n/examples\n" ./.; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ cmake ninja qt6.qtshadertools spirv-tools + cli11 qt6.wrapQtAppsHook pkg-config ] ++ (lib.optionals withWayland [ @@ -61,7 +64,6 @@ buildInputs = [ qt6.qtbase qt6.qtdeclarative - cli11 ] ++ lib.optional withCrashReporter breakpad ++ lib.optional withJemalloc jemalloc @@ -96,9 +98,10 @@ dontStrip = debug; meta = with lib; { - homepage = "https://git.outfoxxed.me/outfoxxed/quickshell"; + homepage = "https://quickshell.outfoxxed.me"; description = "Flexbile QtQuick based desktop shell toolkit"; license = licenses.lgpl3Only; platforms = platforms.linux; + mainProgram = "quickshell"; }; } diff --git a/flake.lock b/flake.lock index df5aa3f9..7c25aa23 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a0bc18d4..5de9c96a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,10 @@ }; outputs = { self, nixpkgs }: let - forEachSystem = fn: nixpkgs.lib.genAttrs - [ "x86_64-linux" "aarch64-linux" ] - (system: fn system nixpkgs.legacyPackages.${system}); + forEachSystem = fn: + nixpkgs.lib.genAttrs + nixpkgs.lib.platforms.linux + (system: fn system nixpkgs.legacyPackages.${system}); in { packages = forEachSystem (system: pkgs: rec { quickshell = pkgs.callPackage ./default.nix { diff --git a/quickshell.scm b/quickshell.scm index 05bf2696..26abdc0b 100644 --- a/quickshell.scm +++ b/quickshell.scm @@ -35,9 +35,9 @@ pkg-config qtshadertools spirv-tools - wayland-protocols)) - (inputs (list cli11 - jemalloc + wayland-protocols + cli11)) + (inputs (list jemalloc libdrm libxcb libxkbcommon