1
1
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 13:52:55 +03:00

Move flake to subdirectory

This commit is contained in:
Hilmar Wiegand 2023-12-04 00:16:17 +01:00 committed by Wez Furlong
parent faa2975d99
commit ca0ceb2c2d
3 changed files with 3 additions and 6 deletions

2
.gitignore vendored
View File

@ -60,4 +60,4 @@ dhat-heap.json
/winget-pkgs /winget-pkgs
/assets/flatpak/generated-sources.json /assets/flatpak/generated-sources.json
/__pycache__/ /__pycache__/
/result /nix/result

View File

@ -81,12 +81,12 @@
inherit buildInputs nativeBuildInputs; inherit buildInputs nativeBuildInputs;
name = "wezterm"; name = "wezterm";
src = ./.; src = ./..;
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
version = self.shortRev or "dev"; version = self.shortRev or "dev";
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ../Cargo.lock;
outputHashes = { outputHashes = {
"xcb-imdkit-0.2.0" = "sha256-L+NKD0rsCk9bFABQF4FZi9YoqBHr4VAZeKAWgsaAegw="; "xcb-imdkit-0.2.0" = "sha256-L+NKD0rsCk9bFABQF4FZi9YoqBHr4VAZeKAWgsaAegw=";
"xcb-1.2.1" = "sha256-zkuW5ATix3WXBAj2hzum1MJ5JTX3+uVQ01R1vL6F1rY="; "xcb-1.2.1" = "sha256-zkuW5ATix3WXBAj2hzum1MJ5JTX3+uVQ01R1vL6F1rY=";
@ -101,9 +101,6 @@
ln -s ${libpng} deps/freetype/libpng ln -s ${libpng} deps/freetype/libpng
ln -s ${zlib} deps/freetype/zlib ln -s ${zlib} deps/freetype/zlib
ln -s ${harfbuzz} deps/harfbuzz/harfbuzz ln -s ${harfbuzz} deps/harfbuzz/harfbuzz
echo "==> harfbuzz"
ls deps/harfbuzz/harfbuzz/src
''; '';
postPatch = '' postPatch = ''