diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-30 19:10:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 20:10:07 +0100 |
| commit | 1923c51c0ae99671ba5af07c25c77996fd46a49a (patch) | |
| tree | 6026223bcf60981b03db67e60b91a53d35e25fbd | |
| parent | 3df4d6608fc732c50816a581be7313b35e6f236f (diff) | |
| download | nixpkgs-1923c51c0ae99671ba5af07c25c77996fd46a49a.tar nixpkgs-1923c51c0ae99671ba5af07c25c77996fd46a49a.tar.gz nixpkgs-1923c51c0ae99671ba5af07c25c77996fd46a49a.tar.bz2 nixpkgs-1923c51c0ae99671ba5af07c25c77996fd46a49a.tar.lz nixpkgs-1923c51c0ae99671ba5af07c25c77996fd46a49a.tar.xz nixpkgs-1923c51c0ae99671ba5af07c25c77996fd46a49a.tar.zst nixpkgs-1923c51c0ae99671ba5af07c25c77996fd46a49a.zip | |
cdesktopenv: fix build on upcoming binutils-2.36 (#146750)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
| -rw-r--r-- | pkgs/desktops/cdesktopenv/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 563a1b49e51..7715f4f232a 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, xorgproto, libX11, bison, ksh, perl, gnum4 +{ lib, stdenv, fetchurl +, fetchpatch +, xorgproto, libX11, bison, ksh, perl, gnum4 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf , ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk @@ -27,6 +29,13 @@ in stdenv.mkDerivation rec { patches = [ ./2.3.2.patch ./0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch + + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://github.com/cdesktopenv/cde/commit/0b7849e210a99a413ddeb52a0eb5aef9a08504a0.patch"; + sha256 = "0wlhs617hws3rwln9v74y1nw27n3pp7jkpnxlala7k5y64506ipj"; + stripLen = 1; + }) ]; buildInputs = [ |