diff options
| author | Artturin <Artturin@artturin.com> | 2022-10-14 01:16:16 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-10-14 20:48:09 +0300 |
| commit | 61c3058bcb4877cecd4fd2e15ac64b5052b6aab2 (patch) | |
| tree | 50a3837d655c1e1948516e15d3dd611cc0279f0d /pkgs/development/tools/misc/slint-lsp/default.nix | |
| parent | 96fa2023535f2768db28622b056140ee1e8d9d58 (diff) | |
all-packages.nix: remove `inherit (*xorg) *`'s
using inherits in callPackage args is discouraged and doesn't splice correctly
Diffstat (limited to 'pkgs/development/tools/misc/slint-lsp/default.nix')
| -rw-r--r-- | pkgs/development/tools/misc/slint-lsp/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 2211b5211d6a6..23fc5cc25e377 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -6,11 +6,7 @@ , cmake , fontconfig , libGL -, libxcb -, libX11 -, libXcursor -, libXi -, libXrandr +, xorg , libxkbcommon , wayland # Darwin Frameworks @@ -24,7 +20,7 @@ }: let - rpathLibs = [ fontconfig libGL libxcb libX11 libXcursor libXrandr libXi ] + rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ] ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ]; in rustPlatform.buildRustPackage rec { @@ -39,7 +35,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; - buildInputs = rpathLibs ++ [ libxcb.dev ] + buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics |