use stable nixpkgs (#8641)

This commit is contained in:
Jack Kavanagh
2025-05-07 06:32:57 +02:00
committed by Jay Wu
parent eb07231d69
commit c640feeb2b
2 changed files with 10 additions and 30 deletions

26
flake.lock generated
View File

@@ -2,9 +2,10 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 0,
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
"path": "/nix/store/fnbr9s78sy4islw83vsaf0hgf88hih5v-source",
"lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"path": "/nix/store/52hnnvpyni1n79ra4rqxdcswmd2w3823-source",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"type": "path"
},
"original": {
@@ -12,26 +13,9 @@
"type": "indirect"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1742272065,
"narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3549532663732bfd89993204d40543e9edaec4f2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
"nixpkgs": "nixpkgs"
}
}
},

View File

@@ -1,8 +1,5 @@
{
inputs = {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
};
outputs = { self, nixpkgs, ... }@inputs:
outputs = { nixpkgs, ... }:
let
forAllSystems = with nixpkgs.lib; f: foldAttrs mergeAttrs { }
(map (s: { ${s} = f s; }) systems.flakeExposed);
@@ -12,17 +9,16 @@
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
unstable = inputs.nixpkgs-unstable.legacyPackages.${system};
in
pkgs.mkShell {
buildInputs = [
unstable.nodejs_22
pkgs.nodejs_22
pkgs.yarn
];
# ELECTRON_OVERRIDE_DIST_PATH = "${unstable.electron_35}/bin/";
# ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH";
ELECTRON_OVERRIDE_DIST_PATH = "${pkgs.electron_35}/bin/";
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc ];
});
};
}