diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-18 18:10:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-18 18:10:40 +0000 |
| commit | f42b75df030fa42763d264db3956e1af175d915f (patch) | |
| tree | 06e10fbfb5b0100f418113bee19f11f39860b86f /pkgs/os-specific/darwin | |
| parent | 2095c2cd0da9e780bd4b1bccf5335e43ceb2cca5 (diff) | |
| parent | b57b2b362ce04281b1ce3d7236c4972966405ffe (diff) | |
| download | nixpkgs-f42b75df030fa42763d264db3956e1af175d915f.tar nixpkgs-f42b75df030fa42763d264db3956e1af175d915f.tar.gz nixpkgs-f42b75df030fa42763d264db3956e1af175d915f.tar.bz2 nixpkgs-f42b75df030fa42763d264db3956e1af175d915f.tar.lz nixpkgs-f42b75df030fa42763d264db3956e1af175d915f.tar.xz nixpkgs-f42b75df030fa42763d264db3956e1af175d915f.tar.zst nixpkgs-f42b75df030fa42763d264db3956e1af175d915f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/darling/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index ef9afafbcd3..22fb6d3b07c 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 ''; }; |