diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-20 18:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 18:01:07 +0000 |
| commit | f515d91189c208e5e3ca47687d3bceed2a2fec49 (patch) | |
| tree | 3ce84d5f4562f07ac698189164c1a432fc757cfd /pkgs/applications/window-managers | |
| parent | 2d03d542c7c0ffbf359b9cb199bdcb9bc038f099 (diff) | |
| parent | 4dba55aec572febbf2b0e660b4de4007e0a30a60 (diff) | |
| download | nixpkgs-f515d91189c208e5e3ca47687d3bceed2a2fec49.tar nixpkgs-f515d91189c208e5e3ca47687d3bceed2a2fec49.tar.gz nixpkgs-f515d91189c208e5e3ca47687d3bceed2a2fec49.tar.bz2 nixpkgs-f515d91189c208e5e3ca47687d3bceed2a2fec49.tar.lz nixpkgs-f515d91189c208e5e3ca47687d3bceed2a2fec49.tar.xz nixpkgs-f515d91189c208e5e3ca47687d3bceed2a2fec49.tar.zst nixpkgs-f515d91189c208e5e3ca47687d3bceed2a2fec49.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/afterstep/default.nix | 8 |
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 ec7d3ae5004..ac6ba4e0bf2 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 = '' |