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

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
This commit is contained in:
Vladimír Čunát
2013-03-02 10:41:53 +01:00
parent 97b24ed95a a920c50cfb
commit 26af997d41
101 changed files with 2221 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libsoup/default.nix
+5 -11
View File
@@ -1,29 +1,23 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python
{ stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
stdenv.mkDerivation {
name = "libsoup-2.40.3";
name = "libsoup-2.38.1";
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz;
sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9";
url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
};
nativeBuildInputs = [ pkgconfig intltool python ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check";
preConfigure = ''
substituteInPlace libsoup/tld-parser.py \
--replace "/usr/bin/env python" ${python}/bin/python
'';
meta = {
inherit (glib.meta) maintainers platforms;
};