diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index ea19d09b0246..adda2d364972 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -15,6 +15,7 @@ sqlite, zlib, zstd, + glib, alsa-lib, libxkbcommon, wayland, @@ -107,7 +108,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.226.5"; + version = "0.228.0"; outputs = [ "out" @@ -120,7 +121,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZfYwlHTWirUb2RjEIQyonIHMneCi7ZGD2kPYOfe5HiI="; + hash = "sha256-oQ3cW4cFBkyrO4elTXB3Etek6ilL0XkB45z/tuPwTJs="; }; postPatch = '' @@ -132,6 +133,12 @@ rustPlatform.buildRustPackage (finalAttrs: { # newer versions work just as well. substituteInPlace script/generate-licenses \ --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # webrtc-sys expects glib headers to be in the sysroot, so we have to point it in the right direction + substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \ + --replace-fail 'builder.include(&glib_path);' 'builder.include("${lib.getInclude glib}/include/glib-2.0");' \ + --replace-fail 'builder.include(&glib_path_config);' 'builder.include("${lib.getLib glib}/lib/glib-2.0/include");' ''; # remove package that has a broken Cargo.toml @@ -140,7 +147,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-kdGHSNfvB/GUQ/7iqzXcCF4sbyaMiLYq+/zogg9N/aU="; + cargoHash = "sha256-K4lxI11fEuLYBWy6Z+o0MmtJFJYawwS4UUq0Jgue2hE="; nativeBuildInputs = [ cmake @@ -168,6 +175,7 @@ rustPlatform.buildRustPackage (finalAttrs: { zstd ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + glib alsa-lib libxkbcommon wayland