uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
32
pkgs/applications/misc/wofi/default.nix
Normal file
32
pkgs/applications/misc/wofi/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wofi";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://hg.sr.ht/~scoopta/wofi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];
|
||||
buildInputs = [ wayland gtk3 ];
|
||||
|
||||
patches = [
|
||||
# https://todo.sr.ht/~scoopta/wofi/121
|
||||
./do_not_follow_symlinks.patch
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/wofi*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A launcher/menu program for wlroots based wayland compositors such as sway";
|
||||
homepage = "https://hg.sr.ht/~scoopta/wofi";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ elyhaka ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
39
pkgs/applications/misc/wofi/do_not_follow_symlinks.patch
Normal file
39
pkgs/applications/misc/wofi/do_not_follow_symlinks.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
diff -r 3414ab984249 modes/run.c
|
||||
--- a/modes/run.c Tue Aug 11 19:07:49 2020 -0700
|
||||
+++ b/modes/run.c Sat Aug 22 13:39:52 2020 +0200
|
||||
@@ -91,23 +91,10 @@
|
||||
|
||||
char* path = strdup(getenv("PATH"));
|
||||
|
||||
- struct map* paths = map_init();
|
||||
-
|
||||
char* save_ptr;
|
||||
char* str = strtok_r(path, ":", &save_ptr);
|
||||
do {
|
||||
|
||||
- str = realpath(str, NULL);
|
||||
- if(str == NULL) {
|
||||
- continue;
|
||||
- }
|
||||
- if(map_contains(paths, str)) {
|
||||
- free(str);
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- map_put(paths, str, "true");
|
||||
-
|
||||
DIR* dir = opendir(str);
|
||||
if(dir == NULL) {
|
||||
continue;
|
||||
@@ -132,11 +119,9 @@
|
||||
}
|
||||
free(full_path);
|
||||
}
|
||||
- free(str);
|
||||
closedir(dir);
|
||||
} while((str = strtok_r(NULL, ":", &save_ptr)) != NULL);
|
||||
free(path);
|
||||
- map_free(paths);
|
||||
map_free(cached);
|
||||
map_free(entries);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue