From 158c26ff779fefae2659d8d16a68e12f34c9e373 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 01:10:21 +0000 Subject: [PATCH 1/2] astc-encoder: 3.3 -> 3.4 --- pkgs/tools/graphics/astc-encoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index a982d329f90b..09b442d59d9d 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-5E26QzphF5HwVTH+92S4rT3IUAp9ravT/wxsmaH9IAM="; + sha256 = "sha256-blOfc/H64UErjPjkdZQNp2H/Hw57RbQRFBcUo/C2b0Q="; }; nativeBuildInputs = [ cmake ]; From 80f8c652832aef407c85a069c06ccdc3d0bfb931 Mon Sep 17 00:00:00 2001 From: Maximilian Wende Date: Wed, 9 Mar 2022 12:33:10 +0100 Subject: [PATCH 2/2] astc-encoder: patch files to use a fixed build year The build year is included in the help output. See the discussion in #162133. --- pkgs/tools/graphics/astc-encoder/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 09b442d59d9d..cecc52b9df2d 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -46,6 +46,12 @@ gccStdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" ]; + # Set a fixed build year to display within help output (otherwise, it would be 1980) + postPatch = '' + substituteInPlace Source/cmake_core.cmake \ + --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2022")' + ''; + # Link binaries into environment and provide 'astcenc' link postInstall = '' mv $out/astcenc $out/bin