diff options
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/darling/default.nix | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 2579b0b6a0a6..1bbda6ab7add 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -11,7 +11,7 @@ appleDerivation rec { apple_sdk.frameworks.IOKit openbsm ]; # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" - # + lib.optionalString hostPlatform.isArm "-D__arm__"; + # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" "-DDAEMON_GID=1" "-DDEFAULT_AT_QUEUE=\'a\'" diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index b9d806cded23..c1e29843147c 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -1,14 +1,19 @@ -{stdenv, lib, fetchFromGitHub, cmake, bison, flex}: +{stdenv, lib, fetchzip, cmake, bison, flex}: stdenv.mkDerivation rec { pname = "darling"; name = pname; - src = fetchFromGitHub { - repo = pname; - owner = "darlinghq"; - rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b"; - sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg"; + src = fetchzip { + url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz"; + sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf"; + postFetch = '' + # Get rid of case conflict + mkdir $out + cd $out + tar -xzf $downloadedFile --strip-components=1 + rm -r $out/src/libm + ''; }; # only packaging sandbox for now |