From ff4de5d922a4376751990ba7d84bf3e737b06dfd Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 9 Nov 2024 21:37:38 -0800 Subject: [PATCH] binserve: use new Darwin SDK pattern --- pkgs/servers/binserve/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/binserve/default.nix b/pkgs/servers/binserve/default.nix index 3864c7929945..6ec3c073ac91 100644 --- a/pkgs/servers/binserve/default.nix +++ b/pkgs/servers/binserve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "binserve"; @@ -8,13 +8,9 @@ rustPlatform.buildRustPackage rec { owner = "mufeedvh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s="; + hash = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - ]; - cargoLock.lockFile = ./Cargo.lock; postPatch = '' cp ${./Cargo.lock} Cargo.lock diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f019dc75f7cd..829d07a7be2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -237,9 +237,7 @@ with pkgs; beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; - binserve = callPackage ../servers/binserve { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + binserve = callPackage ../servers/binserve { }; bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;