diff options
author | Scott Worley <scottworley@scottworley.com> | 2022-02-03 10:28:54 -0800 |
---|---|---|
committer | Scott Worley <scottworley@scottworley.com> | 2022-02-04 18:00:48 -0800 |
commit | 55be92724ad081e248631c5d870808b41608991e (patch) | |
tree | 82adfde82fe5e92843ce452372031e753319450d | |
parent | 6a5850edaa525513ba1e6f1ba65aba32b3312922 (diff) | |
download | nixpkgs-55be92724ad081e248631c5d870808b41608991e.tar nixpkgs-55be92724ad081e248631c5d870808b41608991e.tar.gz nixpkgs-55be92724ad081e248631c5d870808b41608991e.tar.bz2 nixpkgs-55be92724ad081e248631c5d870808b41608991e.tar.lz nixpkgs-55be92724ad081e248631c5d870808b41608991e.tar.xz nixpkgs-55be92724ad081e248631c5d870808b41608991e.tar.zst nixpkgs-55be92724ad081e248631c5d870808b41608991e.zip |
screen: 4.8.0 -> 4.9.0
-rw-r--r-- | pkgs/tools/misc/screen/default.nix | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 578d3682066..b217453b132 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { pname = "screen"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://gnu/screen/${pname}-${version}.tar.gz"; - sha256 = "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf"; + sha256 = "1x1hqy4h47i7hk85f779lkwkm7gkq8h8mxwd0znkh5adpf0m4czr"; }; configureFlags= [ @@ -16,14 +16,7 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = [ - (fetchpatch { - # Fixes denial of services in encoding.c, remove > 4.8.0 - name = "CVE-2021-26937.patch"; - url = "https://salsa.debian.org/debian/screen/-/raw/4f7494f943e8941528e651bd967fa3f837435140/debian/patches/99_CVE-2021-26937.patch"; - sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0"; - }) - ] ++ lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; @@ -36,14 +29,13 @@ stdenv.mkDerivation rec { -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' ''; # " - buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam - ++ lib.optional stdenv.isDarwin utmp; - - # Build fails due to missing dependencies on autogenerated header: - # screen.h:48:10: fatal error: comm.h: No such file or directory - # It will be fixed in next screen-4.9.0 release. The patches are - # invasive. Disabling parallelism for 4.8.0. - enableParallelBuilding = false; + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ + ncurses + ] ++ lib.optional stdenv.isLinux pam + ++ lib.optional stdenv.isDarwin utmp; doCheck = true; |