diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-18 13:00:40 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-18 13:49:22 +0000 |
| commit | d020caa5b2eca90ea051403fbb4c52b99ee071b9 (patch) | |
| tree | ba44ef1e784bca89e0df6b249956fd035b1d86e3 /pkgs/applications/misc/zathura | |
| parent | 3e68106afd95df012ddb548575f0133681687a90 (diff) | |
| parent | 0729f606973870c03d21bb2f21b70d91216943ca (diff) | |
| download | nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.gz nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.bz2 nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.lz nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.xz nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.zst nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/misc/zathura')
| -rw-r--r-- | pkgs/applications/misc/zathura/core/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/zathura/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 3a88409999f..62e7ee60cb3 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" - "TPUT=${ncurses}/bin/tput" + "TPUT=${ncurses.out}/bin/tput" ]; postInstall = '' diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 8b37e22d117..0ad3bf2adb9 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -30,7 +30,7 @@ rec { name = "zathura-${zathura_core.version}"; - plugins_path = stdenv.lib.makeSearchPath "lib" [ + plugins_path = stdenv.lib.makeLibraryPath [ zathura_djvu zathura_ps (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) |