From a69170b0baeebe204bbb8f68b3e42c019dde1630 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 17 Aug 2021 17:43:49 +0200 Subject: [PATCH 1/2] shell.nix: make more similar to the code in Nixpkgs Remove the dependency on installShellFiles as it is not needed for building kitty itself and is only used in Nixpkgs for conveniently installing man pages and shell completions. pkgconfig has been renamed to pkg-config. Use `with python3Packages;` to reduce code duplication. This is how it's done in Nixpkgs as well. Also sort the packages in nativeBuildInputs. --- shell.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 0f1265c36..37c36e9a2 100644 --- a/shell.nix +++ b/shell.nix @@ -7,6 +7,7 @@ let inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; harfbuzzWithCoreText = harfbuzz.override { withCoreText = stdenv.isDarwin; }; in +with python3Packages; mkShell rec { buildInputs = [ harfbuzzWithCoreText @@ -29,17 +30,18 @@ mkShell rec { ] ++ checkInputs; nativeBuildInputs = [ - pkgconfig python3Packages.sphinx ncurses + ncurses + pkg-config + sphinx ] ++ optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. - installShellFiles ]; propagatedBuildInputs = optional stdenv.isLinux libGL; checkInputs = [ - python3Packages.pillow + pillow ]; # Causes build failure due to warning when using Clang From f57fb17d2b6b9d03e9cebf89795abe3a286dd98b Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 17 Aug 2021 17:55:40 +0200 Subject: [PATCH 2/2] shell.nix: add new dependencies for building the documentation --- shell.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shell.nix b/shell.nix index 37c36e9a2..c735f1339 100644 --- a/shell.nix +++ b/shell.nix @@ -33,6 +33,10 @@ mkShell rec { ncurses pkg-config sphinx + furo + sphinx-copybutton + sphinxext-opengraph + sphinx-inline-tabs ] ++ optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool.