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

Merge pull request #33652 from thefloweringash/libvncserver-deps

Browse Source 
libvncserver: reduce dependencies; only use systemd on linux
This commit is contained in:
Michael Raskin 2018-01-15 12:32:31 +00:00 committed by GitHub
commit ffb383eca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/libvncserver/default.nix
View File

@ -1,12 +1,8 @@
{stdenv, fetchurl, {stdenv, fetchurl,
libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng,
xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, systemd
libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook
, systemd, pkgconfig, libpng
}: }:
assert stdenv.isLinux;
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -16,27 +12,25 @@ let
url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r"; sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r";
}; };
buildInputs = [
libtool libjpeg openssl libX11 libXdamage xproto damageproto
xextproto libXext fixesproto libXfixes xineramaproto libXinerama
libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd
pkgconfig libpng
];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;
inherit buildInputs;
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };
preConfigure = '' preConfigure = ''
sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
''; '';
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
libtool libjpeg openssl libgcrypt libpng
] ++ stdenv.lib.optional stdenv.isLinux systemd;
propagatedBuildInputs = [ zlib ];
meta = { meta = {
inherit (s) version; inherit (s) version;
description = "VNC server library"; description = "VNC server library";
license = stdenv.lib.licenses.gpl2Plus ; license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }