git.iko.soy/typeable/nixpkgs
on master help sign in
gmrun: if /etc/gmrunrc exists, prefer it over the copy we installed in $out
commit676d292cefd8ea4f620dd6d16f571ff9d24f292d authorPeter Simons <simons@cryp.to> dateThu 2 May 2019, 13:29 (8 years ago) parent1dd5eeb
2 files changed+19
pkgs/applications/misc/gmrun/default.nix+1 pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch+18
pkgs/applications/misc/gmrun/default.nix+1
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 patches = [
2323 ./gcc43.patch
24+ ./find-config-file-in-system-etc-dir.patch
2425 ./gmrun-0.9.2-xdg.patch
2526 ];
2627
pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patchnew file+18
@@ -0,0 +1,18 @@
1+diff -ur gmrun-0.9.2-orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
2+--- gmrun-0.9.2-orig/src/prefs.cc 2019-05-02 12:56:39.025088361 +0200
3++++ gmrun-0.9.2/src/prefs.cc 2019-05-02 13:21:51.179778620 +0200
4+@@ -31,9 +31,11 @@
5+
6+ Prefs::Prefs()
7+ {
8+- string file_name = PACKAGE_DATA_DIR"/";
9+- file_name += GMRUNRC;
10+- init(file_name);
11++ string file_name = "/etc/" GMRUNRC;
12++ if (!init(file_name)) {
13++ file_name = PACKAGE_DATA_DIR "/" GMRUNRC;;
14++ init(file_name);
15++ }
16+
17+ file_name = getenv("HOME");
18+ if (!file_name.empty()) {