diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:38:02 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:41:51 +0100 |
commit | c778945806b44d46ec16bc4302e7e7163e6bab97 (patch) | |
tree | 8c9c088a40cc1619fe6a27e32d295df45c9e9ebc /pkgs/development/tools/build-managers/meson/default.nix | |
parent | 38f85a5bba7038f31a352b09ff7bc68fcbad2633 (diff) | |
download | nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.gz nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.bz2 nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.lz nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.xz nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.tar.zst nixpkgs-c778945806b44d46ec16bc4302e7e7163e6bab97.zip |
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
Diffstat (limited to 'pkgs/development/tools/build-managers/meson/default.nix')
-rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 1b9c3ef6477..8421fb7d70a 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -52,11 +52,6 @@ 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; |