diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 12:14:06 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 12:14:06 -0500 |
| commit | 5c09d977c794d9243ddac17f6c429b5432431f8f (patch) | |
| tree | 1acbd7e7f0c01546d955d47c6a8fddfec8e632b6 /pkgs/desktops | |
| parent | 21d991b1fd78214023551a0dada17b129cbd5cd5 (diff) | |
| parent | 18d059a4ac001fbaa9c2abc750a2830a52e1dae5 (diff) | |
| download | nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.gz nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.bz2 nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.lz nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.xz nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.zst nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 1e3e98cba732..a72efc61e2fe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -23,15 +23,19 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" + "--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/" ]; postPatch = '' patchShebangs build ''; - doCheck = !stdenv.isi686; # https://github.com/NixOS/nixpkgs/issues/51121 + # Tends to fail non-deterministically. + # - https://github.com/NixOS/nixpkgs/issues/55293 + # - https://github.com/NixOS/nixpkgs/issues/51121 + doCheck = false; + # In 3.20.1, tests do not support Python 3 checkInputs = [ dbus python2 ]; |