colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #146895 from trofi/fix-nx-libs-for-binutils-2.36

Browse Source
This commit is contained in:
Sandro 2021-11-30 18:23:11 +01:00 committed by GitHub
commit e6e8cb81bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/X11/nx-libs/default.nix
View File

@ -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