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

glib-networking: fix build

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-14 03:46:24 +01:00
parent 3359dc7f9c
commit 443a6c21a3
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/glib-networking/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy, gnome3
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, gnutls, p11-kit, libproxy, gnome3
, gsettings-desktop-schemas }:
let
@ -15,19 +15,23 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
configureFlags = if stdenv.isDarwin then "--without-ca-certificates"
else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
patches = [
# Use GNUTLS system trust for certificates
(fetchpatch {
url = https://git.gnome.org/browse/glib-networking/patch/?id=f1c8feee014007cc913b71357acb609f8d1200df;
sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i";
})
];
LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
preBuild = ''
sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ glib gnutls libproxy gsettings-desktop-schemas ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
doCheck = false; # tests need to access the certificates (among other things)