diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/search | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/search')
| -rw-r--r-- | nixpkgs/pkgs/applications/search/recoll/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/search/recoll/default.nix b/nixpkgs/pkgs/applications/search/recoll/default.nix index 0560793132d1..902571dd33f1 100644 --- a/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -97,7 +97,10 @@ mkDerivation rec { (lib.withFeature stdenv.isLinux "inotify") ]; - env.NIX_CFLAGS_COMPILE = toString [ "-DNIXPKGS" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-DNIXPKGS" + "-fpermissive" # libxml2-2.12 changed const qualifiers + ]; patches = [ # fix "No/bad main configuration file" error |