summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/zathura/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-annex/default.nix5
4 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 74288657fb3..2ee32f77c1e 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -33,6 +33,8 @@ rec {
 
     builder = ./builder.sh;
 
+    preferLocalBuild = true;
+
     meta = {
       homepage = http://pwmt.org/projects/zathura/;
       description = "A highly customizable and functional PDF viewer";
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index bf4c7f3e7d2..3a73afe48c5 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation {
     echo ${browser} > $out/nix-support/propagated-user-env-packages
   '';
 
+  preferLocalBuild = true;
+
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 7cb1abf3153..51511621dce 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [which pkgconfig file glib gtk2 gtk3 curl];
 
+  preferLocalBuild = true;
+
   meta = {
     description = ''A wrapper to run browser plugins out-of-process'';
     homepage = "http://nspluginwrapper.org/";
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 7a8d6995265..fb00474e567 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -15,8 +15,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140129";
-  sha256 = "0m1n3m16gvd0693i5xq5adki0hd0wdn7p5vqjxkqnc3imx9f11ng";
+  version = "5.20140210";
+  sha256 = "0l5fny743v27yv7spppms64qca0mizh776b6wv8wca0wmcbc6j88";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -53,6 +53,7 @@ cabal.mkDerivation (self: {
     cp dist/build/git-annex/git-annex git-annex
     ./git-annex test
   '';
+  propagatedUserEnvPkgs = [git lsof];
   meta = {
     homepage = "http://git-annex.branchable.com/";
     description = "manage files with git, without checking their contents into git";