From f32a290beb1784abc35b9c35793b695af7b27c71 Mon Sep 17 00:00:00 2001 From: wackbyte Date: Wed, 25 Oct 2023 21:18:21 -0400 Subject: [PATCH 1/2] rojo: 7.2.1 -> 7.4.0 enable OPENSSL_NO_VENDOR --- pkgs/development/tools/rojo/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index c15cb643c6ee..51eed9f2c6ed 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "rojo"; - version = "7.2.1"; + version = "7.4.0"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; rev = "v${version}"; - sha256 = "sha256-Kmq/lBwayYkFU4mbjExj7M9wpg59OkIiTc+2ZrwpuBc="; + sha256 = "sha256-Eh1G0jX9KXVlMZLl8whxULywadblWml232qvcq4JLJ4="; fetchSubmodules = true; }; - cargoSha256 = "sha256-qx6Ja0DMe4cEmDSpovtY9T3+0nJS9XivR92K3UKgacE="; + cargoSha256 = "sha256-aKfgylY9aspL1JpdYa6hOy/6lQoqO54OhZWqSlMPZ8o="; nativeBuildInputs = [ pkg-config @@ -34,6 +34,9 @@ rustPlatform.buildRustPackage rec { CoreServices ]; + # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that + OPENSSL_NO_VENDOR = "1"; + # tests flaky on darwin on hydra doCheck = !stdenv.isDarwin; From fd7886069b857ce8f865796f7ac3f7225b4bd49d Mon Sep 17 00:00:00 2001 From: wackbyte Date: Thu, 18 Jan 2024 08:12:21 -0500 Subject: [PATCH 2/2] rojo: add SystemConfiguration for Darwin --- pkgs/development/tools/rojo/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 51eed9f2c6ed..1eaeed08316a 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -8,7 +8,7 @@ }: let - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; in rustPlatform.buildRustPackage rec { pname = "rojo"; @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices + SystemConfiguration ]; # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that