From 6c46f6f60c3943a0f82d212e7cd99f31c2bbe063 Mon Sep 17 00:00:00 2001 From: Jost Schulte Date: Fri, 24 May 2024 10:26:01 -0600 Subject: [PATCH] nix: use patched nixpkgs --- flake.lock | 23 +++++++++++------------ flake.nix | 16 ++-------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 0252426..2dae6ca 100644 --- a/flake.lock +++ b/flake.lock @@ -109,16 +109,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "nixos", + "lastModified": 1716520893, + "narHash": "sha256-WNHgNAWojDQY6NeAPiWM9AVMlq4SUjycTTq9OQoPTkc=", + "owner": "reckenrode", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "4392e5a53cba868164811553e63a9fd30ec656b7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "reckenrode", + "ref": "override-sdk-list-inputs-fix", "repo": "nixpkgs", "type": "github" } @@ -154,16 +154,15 @@ ] }, "locked": { - "lastModified": 1716559593, - "narHash": "sha256-NiDs4ZHJG1PrvjBsk2rzD7lQ+ILhIMCM4kMCi8ea6uA=", - "owner": "jost-s", + "lastModified": 1716517042, + "narHash": "sha256-PDPMpBVv+6XdV4FvBWk002IBGofDIWCpo9ewks0kStM=", + "owner": "oxalica", "repo": "rust-overlay", - "rev": "a15149d993e66edbd1c76dc9aea6b1169cf241c5", + "rev": "66a43411079d0d1b1b776c0a6ced20a5df896edb", "type": "github" }, "original": { - "owner": "jost-s", - "ref": "fix/return-target-dependency-as-flat-list-for-darwin-std", + "owner": "oxalica", "repo": "rust-overlay", "type": "github" } diff --git a/flake.nix b/flake.nix index 11a7922..6699185 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ # Rust toolchain rust-overlay = { - # url = "github:jost-s/rust-overlay/fix/return-target-dependency-as-flat-list-for-darwin-std"; url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -161,19 +160,8 @@ # additional packages needed for darwin platforms pkgs.darwin.apple_sdk.frameworks.Carbon pkgs.darwin.apple_sdk.frameworks.WebKit - # pkgs.darwin.apple_sdk_11_0.frameworks.Carbon - # pkgs.darwin.apple_sdk_11_0.frameworks.WebKit - # additional packages needed for darwin platforms on x86_64 - # pkgs.darwin.apple_sdk_10_12.frameworks.AppKit - # pkgs.darwin.apple_sdk_10_12.frameworks.CoreFoundation - # pkgs.darwin.apple_sdk_10_12.frameworks.CoreServices - # pkgs.darwin.apple_sdk_10_12.frameworks.Security - # pkgs.darwin.apple_sdk_10_12.frameworks.IOKit - # pkgs.darwin.apple_sdk_10_12.frameworks.WebKit - # pkgs.glib - # pkgs.pkg-config - # pkgs.xcbuild - # pkgs.libiconv + pkgs.darwin.apple_sdk.libs.xpc + pkgs.libiconv ]); # do not check built package as it either builds successfully or not doCheck = false;