diff options
| author | sweenu <brunoinec@gmail.com> | 2022-02-14 16:20:50 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-15 23:23:53 +0100 |
| commit | 2c19ae1e4d8f232883ecf5ffbce68edd955384b8 (patch) | |
| tree | acef3b9bf7a6bfcb4aa9408781ca3f88d885ba34 | |
| parent | c452f7fe15a14c479531147ed1fa7feabb380696 (diff) | |
plocate: 1.1.14 -> 1.1.15
| -rw-r--r-- | pkgs/tools/misc/plocate/dbfile.patch | 29 | ||||
| -rw-r--r-- | pkgs/tools/misc/plocate/default.nix | 9 |
2 files changed, 4 insertions, 34 deletions
diff --git a/pkgs/tools/misc/plocate/dbfile.patch b/pkgs/tools/misc/plocate/dbfile.patch deleted file mode 100644 index 4e0278ae286d5..0000000000000 --- a/pkgs/tools/misc/plocate/dbfile.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 26e7bf8bcb2823819c87115e07932c0d2ba88170 (HEAD -> configurable-dbfile-path) -Author: Eirik Nygaard <eirik@ngrd.no> -Date: Sun Jan 23 12:05:01 2022 +0100 - - Make entire path for plocate database configurable - -diff --git a/meson.build b/meson.build -index 435cd0a..8dc2393 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,8 +2,7 @@ project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std= - - add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp') - add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp') --dbdir = join_paths(get_option('sharedstatedir'), 'plocate') --dbfile = join_paths(dbdir, 'plocate.db') -+dbfile = join_paths(get_option('sharedstatedir'), get_option('dbpath')) - add_project_arguments('-DDBFILE="' + dbfile + '"', language: 'cpp') - add_project_arguments('-DPACKAGE_NAME="plocate"', language: 'cpp') - add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', language: 'cpp') -diff --git a/meson_options.txt b/meson_options.txt -index 8ac13c5..a9f3358 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,3 +3,4 @@ option('install_systemd', type: 'boolean', value: true, description: 'Install sy - option('systemunitdir', type: 'string', description: 'Where to install systemd units to (default: autodetect)') - option('locategroup', type: 'string', value: 'plocate', description: 'Group that the install script will use for the .db file') - option('updatedb_progname', type: 'string', value: 'updatedb', description: 'Binary name of updatedb') -+option('dbpath', type: 'string', value: 'plocate/plocate.db', description: 'Path to plocate database relative to "sharedstatedir"') diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix index ff10019ed9070..f4504a73637e1 100644 --- a/pkgs/tools/misc/plocate/default.nix +++ b/pkgs/tools/misc/plocate/default.nix @@ -11,18 +11,17 @@ }: let dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "plocate"; - version = "1.1.14"; + version = "1.1.15"; src = fetchgit { url = "https://git.sesse.net/plocate"; rev = version; - sha256 = "sha256-SgvCy03H5aKolbkI1dg/0G5VwT3TdSGenn2h9H4gfTY="; + sha256 = "sha256-r8/LivQhJkMTE8ejznr+eGplXFrQl4xwCgXOwbR4wlw="; }; - patches = [ ./dbfile.patch ]; - postPatch = '' sed -i meson.build \ -e '/mkdir\.sh/d' |