tjh.dev
Merge pull request #33652 from thefloweringash/libvncserver-deps
libvncserver: reduce dependencies; only use systemd on linux
authored by Michael Raskin and committed by GitHub ffb383ec 1775b036
+8
-14
pkgs/development/libraries/libvncserver/default.nix
+8
-14
pkgs/development/libraries/libvncserver/default.nix
···
1
{stdenv, fetchurl,
2
-
libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto,
3
-
xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama,
4
-
libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook
5
-
, systemd, pkgconfig, libpng
6
}:
7
-
8
-
assert stdenv.isLinux;
9
10
let
11
s = # Generated upstream information
···
16
url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
17
sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r";
18
};
19
-
buildInputs = [
20
-
libtool libjpeg openssl libX11 libXdamage xproto damageproto
21
-
xextproto libXext fixesproto libXfixes xineramaproto libXinerama
22
-
libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd
23
-
pkgconfig libpng
24
-
];
25
in
26
stdenv.mkDerivation {
27
inherit (s) name version;
28
-
inherit buildInputs;
29
src = fetchurl {
30
inherit (s) url sha256;
31
};
32
preConfigure = ''
33
sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
34
'';
35
meta = {
36
inherit (s) version;
37
description = "VNC server library";
38
license = stdenv.lib.licenses.gpl2Plus ;
39
maintainers = [stdenv.lib.maintainers.raskin];
40
-
platforms = stdenv.lib.platforms.linux;
41
};
42
}
···
1
{stdenv, fetchurl,
2
+
libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng,
3
+
systemd
4
}:
5
6
let
7
s = # Generated upstream information
···
12
url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
13
sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r";
14
};
15
in
16
stdenv.mkDerivation {
17
inherit (s) name version;
18
src = fetchurl {
19
inherit (s) url sha256;
20
};
21
preConfigure = ''
22
sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
23
'';
24
+
nativeBuildInputs = [ pkgconfig autoreconfHook ];
25
+
buildInputs = [
26
+
libtool libjpeg openssl libgcrypt libpng
27
+
] ++ stdenv.lib.optional stdenv.isLinux systemd;
28
+
propagatedBuildInputs = [ zlib ];
29
meta = {
30
inherit (s) version;
31
description = "VNC server library";
32
license = stdenv.lib.licenses.gpl2Plus ;
33
maintainers = [stdenv.lib.maintainers.raskin];
34
+
platforms = stdenv.lib.platforms.unix;
35
};
36
}