ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #258575 from K900/dislocate

Browse Source 
nixos/locate: rip out dbfile overrides
This commit is contained in:
K900 2023-10-02 15:58:09 +03:00 committed by GitHub
commit 469a38c061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/misc/locate.nix
View File

@ -230,9 +230,9 @@ in
plocate = (mkIf isPLocate (mkMerge [ common plocate ]));
};
environment.systemPackages = [ (cfg.locate.override { dbfile = cfg.output; }) ];
environment.systemPackages = [ cfg.locate ];
environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; };
environment.variables.LOCATE_PATH = cfg.output;
environment.etc = {
# write /etc/updatedb.conf for manual calls to `updatedb`

5
pkgs/tools/misc/mlocate/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, config, dbfile ? config.locate.dbfile or "/var/cache/locatedb" }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "mlocate";
@ -9,9 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
};
buildInputs = [ ];
makeFlags = [ "dbfile=${dbfile}" ];
meta = with lib; {
description = "Merging locate is an utility to index and quickly search for files";
homepage = "https://pagure.io/mlocate";

6
pkgs/tools/misc/plocate/default.nix
View File

@ -1,5 +1,4 @@
{ config
, stdenv
{ stdenv
, lib
, fetchgit
, pkg-config
@ -8,7 +7,6 @@
, systemd
, liburing
, zstd
, dbfile ? config.locate.dbfile or "/var/cache/locatedb"
}:
stdenv.mkDerivation rec {
pname = "plocate";
@ -31,8 +29,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dsystemunitdir=${placeholder "out"}/etc/systemd/system"
"-Dsharedstatedir=${builtins.dirOf dbfile}"
"-Ddbpath=${builtins.baseNameOf dbfile}"
];
meta = with lib; {