diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 15:09:55 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 15:09:55 +0100 |
| commit | 1869e7e5b0580e9398529dbebde7e983193c445e (patch) | |
| tree | 151a8b06d499551660d6621a05dc1cf25d89631a /pkgs/desktops | |
| parent | e92a133238aea65770556631bdff307855ecdc77 (diff) | |
| parent | 4d917639fb3c2959f058e533d5ebb2001e5b05fa (diff) | |
| download | nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.gz nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.bz2 nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.lz nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.xz nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.zst nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 8c87609f85cc..6dafa160b1f8 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { postFixup = '' # Patched meson does not add internal libraries to rpath - for f in bin/.epiphany-wrapped libexec/.epiphany-search-provider-wrapped libexec/epiphany/.ephy-profile-migrator-wrapped lib/epiphany/web-extensions/libephywebextension.so; do - patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $out/$f)" "$out/$f" + for f in $out/bin/.*-wrapped $out/libexec/.*-wrapped $out/libexec/epiphany/.*-wrapped $out/lib/epiphany/*.so $out/lib/epiphany/web-extensions/*.so; do + patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $f)" "$f" done ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 6a6722c3b60f..d4f5835ed3a2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam gtk3 gconf libgnome_keyring + dbus libgcrypt pam gtk3 libgnome_keyring pango gcr gdk_pixbuf atk p11_kit ]; @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { patchShebangs build ''; - doCheck = true; + # Tests are not deterministic https://bugzilla.gnome.org/show_bug.cgi?id=791932 + doCheck = false; checkPhase = '' export HOME=$(mktemp -d) dbus-run-session \ |