From 9d8900b8a40e7aad722c78242f9ded2f9546df03 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 21 Jan 2021 13:16:48 +0100
Subject: [PATCH] scons: 4.0.1 -> 4.1.0
---
pkgs/development/tools/build-managers/scons/common.nix | 8 ++++++++
pkgs/development/tools/build-managers/scons/default.nix | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix
index 7a15c193423c..f38b909d5a0c 100644
--- a/pkgs/development/tools/build-managers/scons/common.nix
+++ b/pkgs/development/tools/build-managers/scons/common.nix
@@ -16,11 +16,19 @@ python3Packages.buildPythonApplication rec {
postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") ''
substituteInPlace setup.cfg \
--replace "build/dist" "dist"
+ '' + lib.optionalString (lib.versionAtLeast version "4.1.0") ''
+ substituteInPlace setup.cfg \
+ --replace "build/doc/man/" ""
'';
# The release tarballs don't contain any tests (runtest.py and test/*):
doCheck = lib.versionOlder version "4.0.0";
+ postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") ''
+ mkdir -p "$out/share/man/man1"
+ mv "$out/"*.1 "$out/share/man/man1/"
+ '';
+
meta = with stdenv.lib; {
description = "An improved, cross-platform substitute for Make";
longDescription = ''
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index eb86d5955971..4b07eb0501d8 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -12,7 +12,7 @@ in {
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
}).override { python3Packages = python2Packages; };
scons_latest = mkScons {
- version = "4.0.1";
- sha256 = "0z00l9wzaiqyjq0hapbvsjclvcfjjjq04kmxi7ffq966nl2d2bkj";
+ version = "4.1.0";
+ sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj";
};
}