Merge pull request #204569 from SuperSandro2000/plocate

This commit is contained in:
Sandro 2022-12-07 22:45:17 +01:00 committed by GitHub
commit c8239165c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,6 +2,7 @@
, stdenv , stdenv
, lib , lib
, fetchgit , fetchgit
, fetchpatch
, pkg-config , pkg-config
, meson , meson
, ninja , ninja
@ -14,14 +15,23 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "plocate"; pname = "plocate";
version = "1.1.16"; version = "1.1.17";
src = fetchgit { src = fetchgit {
url = "https://git.sesse.net/plocate"; url = "https://git.sesse.net/plocate";
rev = version; rev = version;
sha256 = "sha256-rwvzDr3leve8BQ30+c3l1+q/7+u7FhPQ7iFcvbx/HjM="; sha256 = "sha256-EcWzvbY8ey5asEJxUeSl10ozApgg+wL5o8NCNw7/W7k=";
}; };
patches = [
# fix redefinition error
(fetchpatch {
url = "https://git.sesse.net/?p=plocate;a=patch;h=0125004cd28c5f9124632b594e51dde73af1691c";
revert = true;
sha256 = "sha256-1TDpxIdpDZQ0IZ/wGG91RVZDrpMpWkvhRF8oE0CJWIY=";
})
];
postPatch = '' postPatch = ''
sed -i meson.build \ sed -i meson.build \
-e '/mkdir\.sh/d' -e '/mkdir\.sh/d'