From 47a738339553e5416e9edb4c5bc71c3497911fb1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 19:14:00 -0500 Subject: [PATCH] darling: fix src Darling has a case conflict which means that its src hash will be different between case sensitive and case insensitive file systems. This is not ideal and the only way around it is basically to remove the offending files from the output. I use fetchzip here to do that but I hope there is a better fix available eventually. --- pkgs/os-specific/darwin/darling/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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