summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers/meson/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-10-26 08:17:14 +0100
committerVladimír Čunát <v@cunat.cz>2020-10-26 08:19:17 +0100
commit336bc8283bd4ef288e60c5fdb1b67196b9ea5c85 (patch)
tree8812d7fef1d0ed89d4507279511f35e2c050097c /pkgs/development/tools/build-managers/meson/default.nix
parent309ce3f8a1127a5dff1dcc2512777122d49529d4 (diff)
downloadnixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.gz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.bz2
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.lz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.xz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.zst
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.zip
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
Diffstat (limited to 'pkgs/development/tools/build-managers/meson/default.nix')
-rw-r--r--pkgs/development/tools/build-managers/meson/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 8421fb7d70a..1b9c3ef6477 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -52,6 +52,11 @@ python3.pkgs.buildPythonApplication rec {
     # cut-in-half-by-\0 store path references.
     # Let’s just clear the whole rpath and hope for the best.
     ./clear-old-rpath.patch
+
+    # Patch out default boost search paths to avoid impure builds on
+    # unsandboxed non-NixOS builds, see:
+    # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
+    ./boost-Do-not-add-system-paths-on-nix.patch
   ];
 
   setupHook = ./setup-hook.sh;