diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:53:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 17:18:49 +0000 |
| commit | c3e005913d59b8ad64004e60888a71816688af1f (patch) | |
| tree | f65b32f0d16acaa40f2ee82ac736d150de4b6cf5 /nixpkgs/pkgs/development/libraries/libjxl | |
| parent | 1c8034da05499ca3d999f57ba1f6b235e7711ee1 (diff) | |
| parent | db88608d8c811a93b74c99cfa1224952afc78200 (diff) | |
| download | nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.gz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.bz2 nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.lz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.xz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.zst nixlib-c3e005913d59b8ad64004e60888a71816688af1f.zip | |
Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libjxl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libjxl/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/nixpkgs/pkgs/development/libraries/libjxl/default.nix index d33b2bc3bb58..b406654caba1 100644 --- a/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -18,17 +18,24 @@ stdenv.mkDerivation rec { pname = "libjxl"; - version = "unstable-2021-06-22"; + version = "0.5"; src = fetchFromGitHub { owner = "libjxl"; repo = "libjxl"; - rev = "409efe027d6a4a4446b84abe8d7b2fa40409257d"; - sha256 = "1akb6yyp2h4h6mfcqd4bgr3ybcik5v5kdc1rxaqnyjs7fp2f6nvv"; + rev = "v${version}"; + sha256 = "0grljgmy6cfhm8zni9d1mdn01qzc49k1pl75vhr7qcd3sp4r8lxm"; # There are various submodules in `third_party/`. fetchSubmodules = true; }; + # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 + # unless we disable highway's tests + postPatch = lib.optional stdenv.isDarwin '' + substituteInPlace third_party/highway/CMakeLists.txt \ + --replace 'if(BUILD_TESTING)' 'if(false)' + ''; + nativeBuildInputs = [ asciidoc # for docs cmake |