From 15cf12c0ac44c1884027cc6e304bf0b00a894d53 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 11 May 2022 12:08:20 -0400 Subject: [PATCH 1/3] singular: fix darwin build --- pkgs/applications/science/math/singular/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 23712061160..aad3eaf529a 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -4,6 +4,7 @@ , buildPackages , sharutils , file +, getconf , flint , ntl , cddlib @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { latex2html texinfo4 texlive.combined.scheme-small - ]; + ] ++ lib.optionals stdenv.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' From e3d8a347fee00b675222ad11a68fd12737e9357f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 11 May 2022 16:32:35 -0500 Subject: [PATCH 2/3] garage: fix build on Darwin Security needs to be added as a buildInput. --- pkgs/tools/filesystems/garage/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 8799ec5a3d2..2818c335176 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitea, protobuf, testers, garage }: +{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }: + rustPlatform.buildRustPackage rec { pname = "garage"; version = "0.7.0"; @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; + buildInputs = lib.optional stdenv.isDarwin Security; + passthru = { tests.version = testers.testVersion { package = garage; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24322febb49..0041e57d646 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6079,7 +6079,9 @@ with pkgs; gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; - garage = callPackage ../tools/filesystems/garage { }; + garage = callPackage ../tools/filesystems/garage { + inherit (darwin.apple_sdk.frameworks) Security; + }; garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; From b1e6ccc862a71e3f57e98ec1631a67b2b18fe98c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 11 May 2022 16:51:17 -0500 Subject: [PATCH 3/3] cliscord: fix build on Darwin Security needs to be added as a buildInput. --- pkgs/misc/cliscord/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 485a6c05041..8ce0da14ce4 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, openssl, pkg-config, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, openssl, pkg-config, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "cliscord"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hzZozgOkw8kFppuHiX9TQxHhxKRv8utWWbhEOIzKDLo="; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24322febb49..ca9d50bbacd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14142,7 +14142,9 @@ with pkgs; clips = callPackage ../development/interpreters/clips { }; - cliscord = callPackage ../misc/cliscord { }; + cliscord = callPackage ../misc/cliscord { + inherit (darwin.apple_sdk.frameworks) Security; + }; clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };