KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shell.nix: make more similar to the code in Nixpkgs

Browse Source 
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.
This commit is contained in:
Luflosi 2021-08-17 17:43:49 +02:00
parent 4066c2389d
commit a69170b0ba
No known key found for this signature in database
GPG Key ID: 4E41E29EDCC345D0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell.nix
View File

@ -7,6 +7,7 @@ let
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
harfbuzzWithCoreText = harfbuzz.override { withCoreText = stdenv.isDarwin; }; harfbuzzWithCoreText = harfbuzz.override { withCoreText = stdenv.isDarwin; };
in in
with python3Packages;
mkShell rec { mkShell rec {
buildInputs = [ buildInputs = [
harfbuzzWithCoreText harfbuzzWithCoreText
@ -29,17 +30,18 @@ mkShell rec {
] ++ checkInputs; ] ++ checkInputs;
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig python3Packages.sphinx ncurses ncurses
pkg-config
sphinx
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
imagemagick imagemagick
libicns # For the png2icns tool. libicns # For the png2icns tool.
installShellFiles
]; ];
propagatedBuildInputs = optional stdenv.isLinux libGL; propagatedBuildInputs = optional stdenv.isLinux libGL;
checkInputs = [ checkInputs = [
python3Packages.pillow pillow
]; ];
# Causes build failure due to warning when using Clang # Causes build failure due to warning when using Clang