Skip to content

Commit 9c9cab0

Browse files
committed
Fix dependencies in recipe and manifest
1 parent 50cdaed commit 9c9cab0

File tree

8 files changed

+2189
-115
lines changed

8 files changed

+2189
-115
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ output/
3434
# Output directory
3535
pixi-build-python-output/
3636
**/repodata.json
37+
target-pixi/

pixi.lock

Lines changed: 2154 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,11 @@ channels = ["https://prefix.dev/conda-forge"]
77
platforms = ["osx-arm64", "win-64", "linux-64", "osx-64"]
88

99
[tasks]
10-
run-release = { cmd = "cargo run --release", inputs = [
11-
"crates/**",
12-
"Cargo.toml",
13-
"Cargo.lock",
14-
], outputs = [
15-
"target/debug/**",
16-
] }
10+
run-release = { cmd = "cargo run --release" }
1711

18-
build = { cmd = "cargo build", inputs = [
19-
"crates/**",
20-
"Cargo.toml",
21-
"Cargo.lock",
22-
], outputs = [
23-
"target/debug/**",
24-
] }
25-
build-release = { cmd = "cargo build --release", inputs = [
26-
"crates/**",
27-
"Cargo.toml",
28-
"Cargo.lock",
29-
], outputs = [
30-
"target/release/**",
31-
] }
32-
run = { cmd = "cargo run", inputs = [
33-
"crates/**",
34-
"Cargo.toml",
35-
"Cargo.lock",
36-
], outputs = [
37-
"target/debug/**",
38-
] }
12+
build = { cmd = "cargo build" }
13+
build-release = { cmd = "cargo build --release" }
14+
run = { cmd = "cargo run" }
3915

4016

4117
install-pixi-build-python = { cmd = "cargo install --path crates/pixi-build-python --locked --force" }
@@ -53,6 +29,21 @@ install-pixi-backends = { depends-on = [
5329
rust = ">=1.86.0,<1.87"
5430
python = ">=3.12.4,<4"
5531

32+
openssl = "3.*"
33+
compilers = "1.6.0.*"
34+
libssh2 = "1.11.0.*"
35+
pkg-config = "0.29.2.*"
36+
libzlib = ">=1.3.1,<2"
37+
liblzma = ">=5.8.1,<6"
38+
39+
[target.linux-64.dependencies]
40+
clang = ">=18.1.8,<19.0"
41+
mold = ">=2.33.0,<3.0"
42+
patchelf = ">=0.17.2,<0.18"
43+
44+
[target.linux-64.activation]
45+
scripts = ["scripts/activate.sh"]
46+
5647
[feature.test.dependencies]
5748
pytest = ">=8.3.2,<9"
5849

recipe/pixi-build-cmake.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ requirements:
99
build:
1010
- ${{ compiler("rust") }}
1111
host:
12-
- xz >=5.0, <6.0
12+
- pkg-config
13+
- libzlib
14+
- liblzma
1315
- if: unix
1416
then: openssl
1517

recipe/pixi-build-python.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ requirements:
99
build:
1010
- ${{ compiler("rust") }}
1111
host:
12-
- xz >=5.0, <6.0
12+
- pkg-config
13+
- libzlib
14+
- liblzma
1315
- if: unix
1416
then: openssl
1517

recipe/pixi-build-rattler-build.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ requirements:
99
build:
1010
- ${{ compiler("rust") }}
1111
host:
12-
- xz >=5.0, <6.0
12+
- pkg-config
13+
- libzlib
14+
- liblzma
1315
- if: unix
1416
then: openssl
1517

recipe/pixi-build-rust.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ requirements:
99
build:
1010
- ${{ compiler("rust") }}
1111
host:
12-
- xz >=5.0, <6.0
12+
- pkg-config
13+
- libzlib
14+
- liblzma
1315
- if: unix
1416
then: openssl
1517

scripts/activate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export CARGO_TARGET_DIR="target-pixi"
2+
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="clang"
3+
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=-fuse-ld=$CONDA_PREFIX/bin/mold"

0 commit comments

Comments
 (0)