From b04fc593e7b55fe1f74421b11589f12a339c92e2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 31 Dec 2020 14:48:55 +0700 Subject: treewide: cmake buildInputs to nativeBuildInputs, minor cleanups --- pkgs/os-specific/darwin/darling/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/os-specific/darwin/darling/default.nix') diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index 846831d0a87..ef9afafbcd3 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { cp src/libaks/include/* $out/include ''; - # buildInputs = [ cmake bison flex ]; - meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; license = licenses.gpl3; -- cgit 1.4.1 From 1a25e9b05cca2e2b0bfa3292798ffe37b5d2dcf8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 22 Dec 2020 18:55:28 -0500 Subject: darwin.darling.src: fix build on case-sensitive filesystems Co-authored-by: Andrew Childs --- pkgs/os-specific/darwin/darling/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/darwin/darling/default.nix') diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index 846831d0a87..1a57a57947f 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -8,11 +8,22 @@ stdenv.mkDerivation rec { url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz"; sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf"; postFetch = '' - # Get rid of case conflict - mkdir $out + # The archive contains both `src/opendirectory` and `src/OpenDirectory`, + # pre-create the directory to choose the canonical case on + # case-insensitive filesystems. + mkdir -p $out/src/OpenDirectory + cd $out tar -xzf $downloadedFile --strip-components=1 rm -r $out/src/libm + + # If `src/opendirectory` and `src/OpenDirectory` refer to different + # things, then combine them into `src/OpenDirectory` to match the result + # on case-insensitive filesystems. + if [ "$(stat -c %i src/opendirectory)" != "$(stat -c %i src/OpenDirectory)" ]; then + mv src/opendirectory/* src/OpenDirectory/ + rmdir src/opendirectory + fi ''; }; -- cgit 1.4.1