From 966c0b234e813764f51409fa69bf98aaff4dd147 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Tue, 18 Jan 2022 18:10:01 +0100 Subject: [PATCH] nx2elf: unstable-2020-05-26 -> unstable-2021-11-21 --- pkgs/tools/compression/nx2elf/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/compression/nx2elf/default.nix b/pkgs/tools/compression/nx2elf/default.nix index 8b7f094bf39..d4963487ada 100644 --- a/pkgs/tools/compression/nx2elf/default.nix +++ b/pkgs/tools/compression/nx2elf/default.nix @@ -2,23 +2,19 @@ stdenv.mkDerivation rec { pname = "nx2elf"; - version = "unstable-2020-05-26"; + version = "unstable-2021-11-21"; src = fetchFromGitHub { owner = "shuffle2"; repo = "nx2elf"; - rev = "7212e82a77b84fcc18ef2d050970350dbf63649b"; - sha256 = "1j4k5s86c6ixa3wdqh4cfm31fxabwn6jcjc6pippx8mii98ac806"; + rev = "735aaa0648a5a6c996b48add9465db86524999f6"; + sha256 = "sha256-cS8FFIEgDWva0j9JXhS+s7Y4Oh+mNhFaKRI7BF2hqvs="; }; buildInputs = [ lz4 ]; postPatch = '' - # This project does not comply with C++14 standards, and compilation on that fails. - # This does however succesfully compile with the gnu++20 standard. - substituteInPlace Makefile --replace "c++14" "gnu++20" - - # pkg-config is not supported, so we'll manually use a non-ancient version of lz4 + # pkg-config is not supported, so we'll manually devendor lz4 cp ${lz4.src}/lib/lz4.{h,c} . '';