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

Merge pull request #172297 from trofi/fix-fno-common-for-directvnc

Browse Source 
directvnc: pull -fno-common fix pending upstream inclusion
This commit is contained in:
Rick van Schijndel 2022-05-11 07:26:39 +02:00 committed by GitHub
commit 6628ac797f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/directvnc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }:
stdenv.mkDerivation {
pname = "directvnc";
@ -11,6 +11,17 @@ stdenv.mkDerivation {
sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchain
# support:
# https://github.com/drinkmilk/directvnc/pull/7
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/drinkmilk/directvnc/commit/e9c23d049bcf31d0097348d44391fe5fd9aad12b.patch";
sha256 = "1dnzr0dnx20w80r73j4a9n6mhbazjzlr5ps9xjj898924cg140zx";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ directfb zlib libjpeg xorgproto ];