mirror of
https://github.com/lightpanda-io/browser.git
synced 2025-10-29 15:13:28 +00:00
Merge pull request #756 from lightpanda-io/nix-2505
Bump Nixpkgs to 25.05
This commit is contained in:
8
flake.lock
generated
8
flake.lock
generated
@@ -20,16 +20,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748344075,
|
"lastModified": 1748964450,
|
||||||
"narHash": "sha256-PsZAY3H0e/PBoDVn4fLwGEmeSwESj7SZPZ6CMfgbWFU=",
|
"narHash": "sha256-ZouDiXkUk8mkMnah10QcoQ9Nu6UW6AFAHLScS3En6aI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e0042dedfbc9134ef973f64e5c7f56a38cc5cc97",
|
"rev": "9ff500cd9e123f46c55855eca64beccead29b152",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixpkgs-unstable",
|
"ref": "release-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
25
flake.nix
25
flake.nix
@@ -2,7 +2,7 @@
|
|||||||
description = "headless browser designed for AI and automation";
|
description = "headless browser designed for AI and automation";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/release-25.05";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -19,27 +19,36 @@
|
|||||||
inherit system;
|
inherit system;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# We need crtbeginS.o for building.
|
||||||
|
crtFiles = pkgs.runCommand "crt-files" { } ''
|
||||||
|
mkdir -p $out/lib
|
||||||
|
cp -r ${pkgs.gcc.cc}/lib/gcc $out/lib/gcc
|
||||||
|
'';
|
||||||
|
|
||||||
# This build pipeline is very unhappy without an FHS-compliant env.
|
# This build pipeline is very unhappy without an FHS-compliant env.
|
||||||
fhs = pkgs.buildFHSEnv {
|
fhs = pkgs.buildFHSEnv {
|
||||||
name = "fhs-shell";
|
name = "fhs-shell";
|
||||||
|
multiArch = true;
|
||||||
targetPkgs =
|
targetPkgs =
|
||||||
pkgs: with pkgs; [
|
pkgs: with pkgs; [
|
||||||
|
# Build Tools
|
||||||
zig
|
zig
|
||||||
zls
|
zls
|
||||||
|
python3
|
||||||
pkg-config
|
pkg-config
|
||||||
cmake
|
cmake
|
||||||
gperf
|
gperf
|
||||||
|
|
||||||
|
# GCC
|
||||||
|
gcc
|
||||||
|
gcc.cc.lib
|
||||||
|
crtFiles
|
||||||
|
|
||||||
|
# Libaries
|
||||||
expat.dev
|
expat.dev
|
||||||
python3
|
|
||||||
glib.dev
|
glib.dev
|
||||||
glibc.dev
|
glibc.dev
|
||||||
zlib
|
zlib
|
||||||
ninja
|
|
||||||
gn
|
|
||||||
gcc-unwrapped
|
|
||||||
binutils
|
|
||||||
clang
|
|
||||||
clang-tools
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|||||||
Reference in New Issue
Block a user