diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
| commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
| tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/development/libraries/glib | |
| parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
| parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
| download | nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.zip | |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3a6192dfca03..120d398bd44d 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" # Needs machine-id, comment the test sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c + sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.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 |