diff options
| author | Lionello Lunesu <lio+git@lunesu.com> | 2021-11-23 21:12:55 -0800 |
|---|---|---|
| committer | Lionello Lunesu <lio+git@lunesu.com> | 2021-11-23 21:39:42 -0800 |
| commit | 894e594d04350f09ee901692fcece52752824963 (patch) | |
| tree | 9567c31038ae5779ec4a328d6078f48d38040a78 /pkgs/development/tools/dtools | |
| parent | 5201be2d3a10da36d7196c13464ee65d84e02582 (diff) | |
| download | nixlib-894e594d04350f09ee901692fcece52752824963.tar nixlib-894e594d04350f09ee901692fcece52752824963.tar.gz nixlib-894e594d04350f09ee901692fcece52752824963.tar.bz2 nixlib-894e594d04350f09ee901692fcece52752824963.tar.lz nixlib-894e594d04350f09ee901692fcece52752824963.tar.xz nixlib-894e594d04350f09ee901692fcece52752824963.tar.zst nixlib-894e594d04350f09ee901692fcece52752824963.zip | |
dtools: Fix aarch64-darwin build
Diffstat (limited to 'pkgs/development/tools/dtools')
| -rw-r--r-- | pkgs/development/tools/dtools/default.nix | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 7a994df51b40..6a7c58f34179 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -1,34 +1,24 @@ -{stdenv, lib, fetchFromGitHub, ldc, curl}: +{stdenv, lib, fetchFromGitHub, fetchpatch, ldc, curl}: stdenv.mkDerivation rec { pname = "dtools"; version = "2.095.1"; - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk"; - name = "dmd"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "tools"; - rev = "v${version}"; - sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b"; - name = "dtools"; + src = fetchFromGitHub { + owner = "dlang"; + repo = "tools"; + rev = "v${version}"; + sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b"; + name = "dtools"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/dlang/tools/pull/441.patch"; # Fix LDC arm64 build + sha256 = "sha256-x6EclTYN1Y5FG57KLhbBK0BZicSYcZoWO7MTVcP4T18="; }) ]; - sourceRoot = "."; - - postUnpack = '' - mv dmd dtools - cd dtools - - ''; - nativeBuildInputs = [ ldc ]; buildInputs = [ curl ]; |