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

Merge #12414: qutebrowser: fix various things

Browse Source
This commit is contained in:
Vladimír Čunát
2016-01-21 11:56:50 +01:00
parent 36fc03edb6 c7e48a3eb8
commit 3317eef084
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,15 +2,15 @@
, gsettings_desktop_schemas }:
let
ver_maj = "2.44";
ver_min = "0";
ver_maj = "2.46";
ver_min = "1";
in
stdenv.mkDerivation rec {
name = "glib-networking-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym";
};
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";

8
pkgs/development/libraries/libsoup/default.nix
View File

@@ -3,15 +3,15 @@
, libintlOrEmpty
, intltool, python }:
let
majorVersion = "2.50";
version = "${majorVersion}.0";
majorVersion = "2.52";
version = "${majorVersion}.2";
in
stdenv.mkDerivation {
name = "libsoup-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
sha256 = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b";
sha256 = "1p4k40y2gikr6m8p3hm0vswdzj2pj133dckipd2jk5bxbj5n4mfv";
};
patchPhase = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
configureFlags = "--disable-tls-check --enable-vala=no" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";