diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-11-19 22:22:22 -0500 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2019-11-21 19:08:06 -0800 |
| commit | 31a9f6a341b4088731c4e83758ca8901290e489e (patch) | |
| tree | 5b4707caa23e6a4cd0229c83d91ad18b307686ad /pkgs | |
| parent | 1a68d9330da524ebdc18497f42fcf5e8b635892d (diff) | |
| download | nixpkgs-31a9f6a341b4088731c4e83758ca8901290e489e.tar nixpkgs-31a9f6a341b4088731c4e83758ca8901290e489e.tar.gz nixpkgs-31a9f6a341b4088731c4e83758ca8901290e489e.tar.bz2 nixpkgs-31a9f6a341b4088731c4e83758ca8901290e489e.tar.lz nixpkgs-31a9f6a341b4088731c4e83758ca8901290e489e.tar.xz nixpkgs-31a9f6a341b4088731c4e83758ca8901290e489e.tar.zst nixpkgs-31a9f6a341b4088731c4e83758ca8901290e489e.zip | |
pijul: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/pijul/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 6d0e39d47bf..3c553918925 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,6 +1,17 @@ { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: -rustPlatform.buildRustPackage rec { +let + # nettle-sys=1.0.1 requires the des-compat.h header, but it was removed in + # nettle 3.5. See https://nest.pijul.com/pijul_org/pijul/discussions/416 + # Remove with the next release + nettle_34 = nettle.overrideAttrs (_oldAttrs: rec { + version = "3.4.1"; + src = fetchurl { + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr"; + }; + }); +in rustPlatform.buildRustPackage rec { pname = "pijul"; version = "0.12.0"; @@ -20,7 +31,7 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = libclang + "/lib"; - buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin + buildInputs = [ openssl libsodium nettle_34 libclang ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security ]); doCheck = false; |