Unverified Commit 922dde89 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

codex: 0.118.0 -> 0.121.0 (#509068)

parents 5230db4d 25433dd5
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@
  librusty_v8 ? callPackage ./librusty_v8.nix {
    inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
  },
  livekit-libwebrtc,
  makeBinaryWrapper,
  nix-update-script,
  pkg-config,
@@ -24,18 +25,27 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "codex";
  version = "0.118.0";
  version = "0.121.0";

  src = fetchFromGitHub {
    owner = "openai";
    repo = "codex";
    tag = "rust-v${finalAttrs.version}";
    hash = "sha256-FdtV+CIqTInnegcXrXBxw4aE0JnNDh4GdYKwUDjSk9Y=";
    hash = "sha256-wjiUMox9V5tFggNgaFyHXWhRlpPerK7W+U/eR2Ddbbc=";
  };

  sourceRoot = "${finalAttrs.src.name}/codex-rs";

  cargoHash = "sha256-7rexlmc79eUkwcqTa8rN3GFDy1dWs+0h/SUllZqAcpM=";
  cargoHash = "sha256-zpQ0vg9XuarLfdZYiRIhcwLHUOdunNbOb5xLW3MPzp8=";

  postPatch = ''
    # webrtc-sys asks rustc to link libwebrtc statically by default,
    # but nixpkgs provides libwebrtc as a shared library.
    # use LK_CUSTOM_WEBRTC to point to the packaged library and adjust linking
    # to use the shared library instead
    substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \
      --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
  '';

  nativeBuildInputs = [
    clang
@@ -60,6 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  # character-conversion warning-as-error disabled.
  env = {
    LIBCLANG_PATH = "${lib.getLib libclang}/lib";
    LK_CUSTOM_WEBRTC = lib.getDev livekit-libwebrtc;
    NIX_CFLAGS_COMPILE = toString (
      lib.optionals stdenv.cc.isGNU [
        "-Wno-error=stringop-overflow"