Skip to content

Commit

Permalink
Reapply "less: Fix withSecure regression"
Browse files Browse the repository at this point in the history
This reverts commit 6df0b10.
This change was originally merged as PR #352298
but it got moved to staging here.
  • Loading branch information
vcunat committed Nov 5, 2024
1 parent 60d7073 commit b048be0
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions pkgs/by-name/le/less/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
lib,
fetchurl,
fetchpatch,
autoreconfHook,
ncurses,
pcre2,
stdenv,
Expand All @@ -22,6 +24,23 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg=";
};

patches = [
(fetchpatch {
# Fix configure parameters --with-secure=no and --without-secure.
url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch";
hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA=";
includes = [
"configure.ac"
];
})
];

# Need `autoreconfHook` since we patch `configure.ac`.
# TODO: Remove the `configure.ac` patch and `autoreconfHook` next release
nativeBuildInputs = [
autoreconfHook
];

buildInputs = [
ncurses
pcre2
Expand Down

0 comments on commit b048be0

Please sign in to comment.