summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2021-11-20 11:30:33 -0300
committerGitHub <noreply@github.com>2021-11-20 11:30:33 -0300
commit9377c08f8a51562c15eb260d6427e2b58299b52a (patch)
tree6e462028b341430ca7a8b53c6c5b5c449909dae3
parentMerge pull request #139763 from onny/foo2zjs (diff)
parentafterstep: fix build on upcoming binutils-2.36 (diff)
downloadnixpkgs-9377c08f8a51562c15eb260d6427e2b58299b52a.tar.gz
Merge pull request #146741 from trofi/fix-afterstep-for-binutils-2.36
afterstep: fix build on upcoming binutils-2.36
-rw-r--r--pkgs/applications/window-managers/afterstep/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index ec7d3ae5004d..ac6ba4e0bf29 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch";
sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4";
})
+
+ # Fix pending upstream inclusion for binutils-2.36 support:
+ # https://github.com/afterstep/afterstep/pull/7
+ (fetchpatch {
+ name = "binutils-2.36.patch";
+ url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch";
+ sha256 = "1kk97max05r2p1a71pvpaza79ff0klz32rggik342p7ki3516qv8";
+ })
];
postPatch = ''