diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-30 18:23:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 18:23:11 +0100 |
| commit | e6e8cb81bd7a6042354f1604878560571d88cb16 (patch) | |
| tree | 8d40d35dacf6018e0a61201ae661d761e033fd20 /pkgs/tools/X11 | |
| parent | 37ced1e87ffa885d839dc841fa3f6df377a3b5c3 (diff) | |
| parent | d793cbc4aa4192c19abee64718ac0b3785cda10f (diff) | |
| download | nixpkgs-e6e8cb81bd7a6042354f1604878560571d88cb16.tar nixpkgs-e6e8cb81bd7a6042354f1604878560571d88cb16.tar.gz nixpkgs-e6e8cb81bd7a6042354f1604878560571d88cb16.tar.bz2 nixpkgs-e6e8cb81bd7a6042354f1604878560571d88cb16.tar.lz nixpkgs-e6e8cb81bd7a6042354f1604878560571d88cb16.tar.xz nixpkgs-e6e8cb81bd7a6042354f1604878560571d88cb16.tar.zst nixpkgs-e6e8cb81bd7a6042354f1604878560571d88cb16.zip | |
Merge pull request #146895 from trofi/fix-nx-libs-for-binutils-2.36
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/nx-libs/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 022111e4b31..ed28cfbb8d8 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo +{ lib, stdenv, autoconf, automake, fetchFromGitHub, fetchpatch +, libgcc, libjpeg_turbo , libpng, libtool, libxml2, pkg-config, which, xorg , libtirpc }: @@ -12,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ="; }; + patches = [ + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://github.com/ArcticaProject/nx-libs/commit/605a266911b50ababbb3f8a8b224efb42743379c.patch"; + sha256 = "sha256-kk5ms3i0PrHL74I4OlsqDrdDcCJ0us03cQcBy4zjAoQ="; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config which xorg.gccmakedep xorg.imake ]; buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil |