mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-06-09 09:34:57 +09:00
nix: Clean up files, use good practices
This commit is contained in:
parent
6654021655
commit
720feaa658
Notes:
sideshowbarker
2024-07-17 01:04:03 +09:00
Author: https://github.com/RGBCube 🔰
Commit: 720feaa658
Pull-request: https://github.com/SerenityOS/serenity/pull/23603
Reviewed-by: https://github.com/ADKaster ✅
Reviewed-by: https://github.com/MacDue
7 changed files with 55 additions and 94 deletions
|
@ -1,9 +1,7 @@
|
|||
{ pkgs ? import <nixpkgs> { } }:
|
||||
with pkgs;
|
||||
{ pkgs ? import <nixpkgs> { } }: with pkgs;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cpp-env";
|
||||
nativeBuildInputs = [
|
||||
mkShell.override { stdenv = gcc13Stdenv; } {
|
||||
packages = [
|
||||
ccache
|
||||
cmake
|
||||
curl
|
||||
|
@ -21,11 +19,6 @@ stdenv.mkDerivation {
|
|||
rsync
|
||||
texinfo
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
e2fsprogs
|
||||
fuse2fs
|
||||
# To build the GRUB disk image
|
||||
grub2
|
||||
libxcrypt
|
||||
|
@ -34,6 +27,4 @@ stdenv.mkDerivation {
|
|||
qemu
|
||||
python3
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" "fortify" ];
|
||||
}
|
61
Toolchain/flake.lock
generated
61
Toolchain/flake.lock
generated
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1692799911,
|
||||
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1701253981,
|
||||
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
description = "Serenity OS";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
};
|
||||
outputs = { self, flake-utils, nixpkgs }:
|
||||
|
||||
flake-utils.lib.eachDefaultSystem
|
||||
(system:
|
||||
let pkgs = nixpkgs.legacyPackages.${system}; in
|
||||
{
|
||||
formatter = pkgs.nixpkgs-fmt;
|
||||
devShells.default = import ./serenity.nix { inherit pkgs; };
|
||||
devShells.ladybird = import ../Ladybird/ladybird.nix { inherit pkgs; };
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue