diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-21 16:26:29 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-21 16:36:48 +0000 |
| commit | d793cbc4aa4192c19abee64718ac0b3785cda10f (patch) | |
| tree | 1aa44aef525791d45d30a29cf56177e98f6549e7 /pkgs/tools/X11 | |
| parent | 2500dc815c42fb4ae67fb614dd4386edd844055e (diff) | |
| download | nixpkgs-d793cbc4aa4192c19abee64718ac0b3785cda10f.tar nixpkgs-d793cbc4aa4192c19abee64718ac0b3785cda10f.tar.gz nixpkgs-d793cbc4aa4192c19abee64718ac0b3785cda10f.tar.bz2 nixpkgs-d793cbc4aa4192c19abee64718ac0b3785cda10f.tar.lz nixpkgs-d793cbc4aa4192c19abee64718ac0b3785cda10f.tar.xz nixpkgs-d793cbc4aa4192c19abee64718ac0b3785cda10f.tar.zst nixpkgs-d793cbc4aa4192c19abee64718ac0b3785cda10f.zip | |
nx-libs: fix build on upcoming binutils-2.36
Without the change build fails on binutils-2.36 as:
ar: libdeps specified more than once
failed command: ar clq libdix.a atom.o colormap.o cursor.o
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 |