diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-09-20 23:45:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-20 23:45:28 +0200 |
| commit | 87a9e5eb3107158cda34baf6fb9a7337e96d9372 (patch) | |
| tree | 9d8de1004d8b03c46b4f7a50d9bc5cea2829c0f7 | |
| parent | ae293ad45eb8ccbe4da7cbac8fabdf88000c39b0 (diff) | |
| parent | 0d65acf47c83debdf3089cb3f66aee045b3cdce1 (diff) | |
| download | nixlib-87a9e5eb3107158cda34baf6fb9a7337e96d9372.tar nixlib-87a9e5eb3107158cda34baf6fb9a7337e96d9372.tar.gz nixlib-87a9e5eb3107158cda34baf6fb9a7337e96d9372.tar.bz2 nixlib-87a9e5eb3107158cda34baf6fb9a7337e96d9372.tar.lz nixlib-87a9e5eb3107158cda34baf6fb9a7337e96d9372.tar.xz nixlib-87a9e5eb3107158cda34baf6fb9a7337e96d9372.tar.zst nixlib-87a9e5eb3107158cda34baf6fb9a7337e96d9372.zip | |
Merge pull request #68627 from Ma27/build-unfree-locally
treewide: build some unfree packages locally
| -rw-r--r-- | pkgs/applications/editors/jetbrains/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/xmind/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/teamviewer/default.nix | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index be20800cde29..f535d7bff47c 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -77,4 +77,6 @@ with stdenv; lib.makeOverridable mkDerivation rec { ln -s "$item/share/applications" $out/share ''; +} // stdenv.lib.optionalAttrs (!(meta.license.free or true)) { + preferLocalBuild = true; } diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index 0332de0195cd..f65f5bc26e8b 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f"; }; + preferLocalBuild = true; + patches = [ ./java-env-config-fixes.patch ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index f9b17b42bdee..d9a3d4aefcdc 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -54,6 +54,7 @@ mkDerivation rec { ''; dontStrip = true; + preferLocalBuild = true; meta = with lib; { homepage = http://www.teamviewer.com; |