Skip to content

Commit d95a18b

Browse files
authored
Merge pull request #756 from lightpanda-io/nix-2505
Bump Nixpkgs to 25.05
2 parents bcd4bdb + 9f4ee7d commit d95a18b

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

flake.lock

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

flake.nix

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "headless browser designed for AI and automation";
33

44
inputs = {
5-
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
5+
nixpkgs.url = "github:nixos/nixpkgs/release-25.05";
66
flake-utils.url = "github:numtide/flake-utils";
77
};
88

@@ -19,27 +19,36 @@
1919
inherit system;
2020
};
2121

22+
# We need crtbeginS.o for building.
23+
crtFiles = pkgs.runCommand "crt-files" { } ''
24+
mkdir -p $out/lib
25+
cp -r ${pkgs.gcc.cc}/lib/gcc $out/lib/gcc
26+
'';
27+
2228
# This build pipeline is very unhappy without an FHS-compliant env.
2329
fhs = pkgs.buildFHSEnv {
2430
name = "fhs-shell";
31+
multiArch = true;
2532
targetPkgs =
2633
pkgs: with pkgs; [
34+
# Build Tools
2735
zig
2836
zls
37+
python3
2938
pkg-config
3039
cmake
3140
gperf
41+
42+
# GCC
43+
gcc
44+
gcc.cc.lib
45+
crtFiles
46+
47+
# Libaries
3248
expat.dev
33-
python3
3449
glib.dev
3550
glibc.dev
3651
zlib
37-
ninja
38-
gn
39-
gcc-unwrapped
40-
binutils
41-
clang
42-
clang-tools
4352
];
4453
};
4554
in

0 commit comments

Comments
 (0)