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

Merge commit staging+systemd into closure-size

Browse Source 
Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
Vladimír Čunát
2015-10-03 13:33:13 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708456 additions and 130039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
with stdenv.lib;
assert !stdenv.isDarwin -> stdenv.cc.cc.isGNU or false;
assert !stdenv.isDarwin -> stdenv.cc.isGNU;
# TODO:
# * Add gio-module-fam
@@ -39,7 +39,7 @@ let
ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.44";
ver_maj = "2.46";
ver_min = "0";
in
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "1fgmjv3yzxgbks31h42201x2izpw0sd84h8dfw0si3x00sqn5lzj";
sha256 = "b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
@@ -101,6 +101,8 @@ stdenv.mkDerivation rec {
sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
# All gschemas fail to pass the test, upstream bug?
sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
# Cannot reproduce the failing test_associations on hydra
sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
# Needed because of libtool wrappers
sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
'';

6
pkgs/development/libraries/glib/setup-hook.sh
View File

@@ -11,6 +11,12 @@ make_glib_find_gsettings_schemas() {
envHooks+=(make_glib_find_gsettings_schemas)
glibPreFixupPhase() {
# Move gschemas in case the install flag didn't help
if [ -d "$out/share/glib-2.0/schemas" ]; then
mkdir -p "$out/share/gsettings-schemas/$name/glib-2.0"
mv "$out/share/glib-2.0/schemas" "$out/share/gsettings-schemas/$name/glib-2.0/"
fi
addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
}