diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/tools/misc/autogen/default.nix | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/autogen/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/misc/autogen/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix index a1e543f30fa0..3cb6760842f5 100644 --- a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix @@ -51,6 +51,12 @@ stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch?id=43bcc61c56a5a7de0eaf806efec7d8c0e4c01ae7"; sha256 = "18d7y1f6164dm1wlh7rzbacfygiwrmbc35a7qqsbdawpkhydm5lr"; }) + (fetchpatch { + name = "lfs64.patch"; + url = "https://cygwin.com/cgit/cygwin-packages/autogen/plain/5.16.2-cygwin17.patch?id=6f39882873b3d1290ba3739e0557a84bfe05ba60"; + stripLen = 1; + hash = "sha256-6dk2imqForUHKhI82CTronWaS3KUWW/EKfA/JZZcRe0="; + }) ]; outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; @@ -79,6 +85,7 @@ stdenv.mkDerivation rec { # If you are curious about the number 78, it has been cargo-culted from # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21 "--enable-timeout=78" + "CFLAGS=-D_FILE_OFFSET_BITS=64" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # the configure check for regcomp wants to run a host program "libopts_cv_with_libregex=yes" |