Skip to content

Commit 9cbc49c

Browse files
committed
fixup! tools: update nixpkgs-unstable to c0f3d81a7ddbc2b1332be0d8481a672b4f6
1 parent 489e1e9 commit 9cbc49c

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let
6464
++ pkgs.lib.optional (!withSSL) "--without-ssl"
6565
++ pkgs.lib.optional withTemporal "--v8-enable-temporal-support"
6666
++ pkgs.lib.optional (ninja != null) "--ninja"
67-
++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ../..}"
67+
++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ./.}"
6868
++ pkgs.lib.concatMap (name: [
6969
"--shared-${name}"
7070
"--shared-${name}-libpath=${pkgs.lib.getLib sharedLibDeps.${name}}/lib"

tools/nix/sharedLibDeps.nix

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,9 @@
4949
// (pkgs.lib.optionalAttrs withSSL (
5050
let
5151
version = "3.5.5";
52-
opensslSrc = "/pkgs/development/libraries/openssl/";
53-
inherit
54-
(pkgs.callPackage "${
55-
pkgs.fetchgit {
56-
url = "https://github.com/NixOS/nixpkgs.git";
57-
rev = "a5b50d31e0fd60227495ad2b2760cbda3581ec77";
58-
sparseCheckout = [ opensslSrc ];
59-
nonConeMode = true;
60-
hash = "sha256-Qo3IoUeccGO2GxFSYufyYjZmN5LGSek0z82pN73YXic=";
61-
}
62-
}${opensslSrc}" { })
63-
openssl_3_6
64-
;
6552
in
6653
{
67-
openssl = openssl_3_6.overrideAttrs (old: {
54+
openssl = pkgs.openssl_3_6.overrideAttrs (old: {
6855
inherit version;
6956
src = pkgs.fetchurl {
7057
url = builtins.replaceStrings [ old.version ] [ version ] old.src.url;

0 commit comments

Comments
 (0)