From 161d029d7d3850648ab6d0df520584fd91d30409 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 10 Feb 2014 21:03:17 +0100 Subject: preferLocalBuild: set to true for wrappers and fetchers --- pkgs/applications/misc/zathura/default.nix | 2 ++ pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 ++ .../networking/browsers/mozilla-plugins/nspluginwrapper/default.nix | 2 ++ pkgs/build-support/clang-wrapper/default.nix | 2 ++ pkgs/build-support/fetchgit/default.nix | 2 ++ pkgs/build-support/fetchsvn/default.nix | 2 ++ pkgs/build-support/gcc-wrapper/default.nix | 2 ++ pkgs/build-support/kdewrapper/default.nix | 2 ++ pkgs/data/fonts/fontWrap/default.nix | 1 + pkgs/development/interpreters/python/python-linkme-wrapper.nix | 2 ++ pkgs/development/libraries/boost/header-only-wrapper.nix | 2 ++ pkgs/development/libraries/xlibs-wrapper/default.nix | 2 ++ pkgs/development/lisp-modules/clwrapper/default.nix | 2 ++ pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 ++ 14 files changed, 27 insertions(+) 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/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 49ee34e9926..4b2a5a1182e 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -84,4 +84,6 @@ stdenv.mkDerivation { if stdenv.system == "mips64el-linux" then "ld.so.1" else abort "don't know the name of the dynamic linker for this platform") else ""; + + preferLocalBuild = true; } diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index e94e4185936..01424bae30b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation { # by definition pure. "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; + + preferLocalBuild = true; } diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 30625a758f8..228a5eaa580 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -40,4 +40,6 @@ stdenv.mkDerivation { # by definition pure. "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; + + preferLocalBuild = true; } diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 1f521f40585..55c6571bcf5 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -92,4 +92,6 @@ stdenv.mkDerivation { if stdenv.system == "mips64el-linux" then "ld.so.1" else abort "don't know the name of the dynamic linker for this platform") else ""; + + preferLocalBuild = true; } diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix index be90011f493..6dcf68a324a 100644 --- a/pkgs/build-support/kdewrapper/default.nix +++ b/pkgs/build-support/kdewrapper/default.nix @@ -39,4 +39,6 @@ stdenv.mkDerivation { chmod +x $PROG done ''; + + preferLocalBuild = true; } diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 0d6750614d4..a7bf1ce0ce9 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { name = "wrapped-font-dir"; builder = writeScript (name + "-builder") (textClosure localDefs [ doInstall doForceShare doPropagate]); + preferLocalBuild = true; meta = { description = " Just a wrapper to create fonts.dir and fonts.scale . diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.nix b/pkgs/development/interpreters/python/python-linkme-wrapper.nix index 8d783a8c11e..040dd7531a2 100644 --- a/pkgs/development/interpreters/python/python-linkme-wrapper.nix +++ b/pkgs/development/interpreters/python/python-linkme-wrapper.nix @@ -10,4 +10,6 @@ stdenv.mkDerivation { cat ${./python-linkme-wrapper.sh} > $out/bin/.python-linkme-wrapper chmod +x $out/bin/.python-linkme-wrapper ''; + + preferLocalBuild = true; } diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix index 6027ea5c393..96c9216a371 100644 --- a/pkgs/development/libraries/boost/header-only-wrapper.nix +++ b/pkgs/development/libraries/boost/header-only-wrapper.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost ''; + preferLocalBuild = true; + meta = { homepage = "http://boost.org/"; description = "Boost C++ Library Collection"; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index 07220d6e1a6..fcdab133e2f 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation { installPhase = "mkdir -p $out"; unpackPhase = "sourceRoot=."; propagatedBuildInputs = packages; + + preferLocalBuild = true; } // { # For compatability with XFree86. buildClientLibs = true; diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 0ae4ce13064..efaadf5606e 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { phases="installPhase fixupPhase"; + preferLocalBuild = true; + passthru = { inherit lisp; }; diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index 2d1de93fed8..e001a36cab0 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -68,6 +68,8 @@ rec { done '' ) [ "minInit" "defEnsureDir" "addInputs" ]; + preferLocalBuild = true; + meta = { description = "TeX distribution directory"; longDescription = '' -- cgit 1.4.1