tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From b65921873585616c86a591eee9efbc68f84eb3d3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
3Date: Wed, 25 Aug 2021 12:03:09 -0300
4Subject: [PATCH] Fix paths
5
6---
7 fbmenugen | 11 +++++------
8 1 file changed, 5 insertions(+), 6 deletions(-)
9
10diff --git a/fbmenugen b/fbmenugen
11index 241be16..5fc9aea 100755
12--- a/fbmenugen
13+++ b/fbmenugen
14@@ -214,9 +214,7 @@ my %CONFIG = (
15
16 #<<<
17 desktop_files_paths => [
18- '/usr/share/applications',
19- '/usr/local/share/applications',
20- '/usr/share/applications/kde4',
21+ '/run/current-system/sw/share/applications',
22 "$home_dir/.local/share/applications",
23 ],
24 #>>>
25@@ -252,7 +250,7 @@ if (not -e $config_file) {
26 }
27
28 if (not -e $schema_file) {
29- if (-e (my $etc_schema_file = "/etc/xdg/$pkgname/schema.pl")) {
30+ if (-e (my $etc_schema_file = "@fbmenugen@/etc/xdg/$pkgname/schema.pl")) {
31 require File::Copy;
32 File::Copy::copy($etc_schema_file, $schema_file)
33 or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n";
34@@ -588,7 +586,7 @@ EXIT
35 $generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER";
36 [config] (Configure)
37 [submenu] (System Styles) {Choose a style...}
38- [stylesdir] (/usr/share/fluxbox/styles)
39+ [stylesdir] (@fluxbox@/share/fluxbox/styles)
40 [end]
41 [submenu] (User Styles) {Choose a style...}
42 [stylesdir] (~/.fluxbox/styles)
43@@ -598,12 +596,13 @@ EXIT
44 [exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}
45 [exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png}
46 [exec] (Run) {fbrun}
47- [exec] (Regen Menu) {fluxbox-generate_menu}
48+ [exec] (Regen Menu) {@fluxbox@/bin/fluxbox-generate_menu}
49 [end]
50 [commanddialog] (Fluxbox Command)
51 [reconfig] (Reload config)
52 [restart] (Restart)
53 [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center}
54+ [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center}
55 [separator]
56 [exit] (Exit)
57 [end]
58--
592.32.0
60