mirror of
https://github.com/openai/codex.git
synced 2025-12-03 18:35:00 +00:00
Fix nix build (#4048)
I dropped the build of the old cli from the flake, where the default.nix already seemed to removed in a previous iterations. Then I updated flake.nix and codex-rs expression to be able to build again (see individual commits for details). Tested by running the following builds: ``` $ nix build .#packages.x86_64-linux.codex-rs $ nix build .#packages.aarch64-darwin.codex-cli ``` --------- Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
@@ -1,42 +1,31 @@
|
||||
{ pkgs, monorep-deps ? [], ... }:
|
||||
let
|
||||
{
|
||||
openssl,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
env = {
|
||||
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig:$PKG_CONFIG_PATH";
|
||||
PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig:$PKG_CONFIG_PATH";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
package = pkgs.rustPlatform.buildRustPackage {
|
||||
inherit env;
|
||||
pname = "codex-rs";
|
||||
version = "0.1.0";
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
doCheck = false;
|
||||
src = ./.;
|
||||
nativeBuildInputs = with pkgs; [
|
||||
pkg-config
|
||||
openssl
|
||||
];
|
||||
meta = with pkgs.lib; {
|
||||
description = "OpenAI Codex command‑line interface rust implementation";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/openai/codex";
|
||||
};
|
||||
pname = "codex-rs";
|
||||
version = "0.1.0";
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
doCheck = false;
|
||||
src = ./.;
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
openssl
|
||||
];
|
||||
|
||||
cargoLock.outputHashes = {
|
||||
"ratatui-0.29.0" = "sha256-HBvT5c8GsiCxMffNjJGLmHnvG77A6cqEL+1ARurBXho=";
|
||||
};
|
||||
devShell = pkgs.mkShell {
|
||||
inherit env;
|
||||
name = "codex-rs-dev";
|
||||
packages = monorep-deps ++ [
|
||||
pkgs.cargo
|
||||
package
|
||||
];
|
||||
shellHook = ''
|
||||
echo "Entering development shell for codex-rs"
|
||||
alias codex="cd ${package.src}/tui; cargo run; cd -"
|
||||
${pkgs.rustPlatform.cargoSetupHook}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenAI Codex command‑line interface rust implementation";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/openai/codex";
|
||||
};
|
||||
app = {
|
||||
type = "app";
|
||||
program = "${package}/bin/codex";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
63
flake.lock
generated
63
flake.lock
generated
@@ -1,30 +1,12 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1744463964,
|
||||
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
|
||||
"lastModified": 1758427187,
|
||||
"narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
|
||||
"rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -36,44 +18,7 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rust-overlay": "rust-overlay"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746844454,
|
||||
"narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "be092436d4c0c303b654e4007453b69c0e33009e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
75
flake.nix
75
flake.nix
@@ -1,57 +1,28 @@
|
||||
{
|
||||
description = "Development Nix flake for OpenAI Codex CLI";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
rust-overlay = {
|
||||
url = "github:oxalica/rust-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
outputs = { nixpkgs, ... }:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
forAllSystems = f: nixpkgs.lib.genAttrs systems f;
|
||||
in
|
||||
{
|
||||
packages = forAllSystems (system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
codex-rs = pkgs.callPackage ./codex-rs { };
|
||||
in
|
||||
{
|
||||
codex-rs = codex-rs;
|
||||
default = codex-rs;
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, flake-utils, rust-overlay, ... }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
};
|
||||
pkgsWithRust = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [ rust-overlay.overlays.default ];
|
||||
};
|
||||
monorepo-deps = with pkgs; [
|
||||
# for precommit hook
|
||||
pnpm
|
||||
husky
|
||||
];
|
||||
codex-cli = import ./codex-cli {
|
||||
inherit pkgs monorepo-deps;
|
||||
};
|
||||
codex-rs = import ./codex-rs {
|
||||
pkgs = pkgsWithRust;
|
||||
inherit monorepo-deps;
|
||||
};
|
||||
in
|
||||
rec {
|
||||
packages = {
|
||||
codex-cli = codex-cli.package;
|
||||
codex-rs = codex-rs.package;
|
||||
};
|
||||
|
||||
devShells = {
|
||||
codex-cli = codex-cli.devShell;
|
||||
codex-rs = codex-rs.devShell;
|
||||
};
|
||||
|
||||
apps = {
|
||||
codex-cli = codex-cli.app;
|
||||
codex-rs = codex-rs.app;
|
||||
};
|
||||
|
||||
defaultPackage = packages.codex-cli;
|
||||
defaultApp = apps.codex-cli;
|
||||
defaultDevShell = devShells.codex-cli;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user