diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
commit | aa4353b499e6950b7333578f936455a628145c31 (patch) | |
tree | c6332cedece2327a18d08794755b3fc0f9f1905b /nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch | |
parent | ac456d475f4e50818499b804359355c0f3b4bbf7 (diff) | |
parent | 52185f4d76c18d8348f963795dfed1de018e8dfe (diff) | |
download | nixlib-aa4353b499e6950b7333578f936455a628145c31.tar nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.gz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.bz2 nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.lz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.xz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.zst nixlib-aa4353b499e6950b7333578f936455a628145c31.zip |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch b/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch new file mode 100644 index 000000000000..61fcda5593fd --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch @@ -0,0 +1,50 @@ +diff --git a/src/functions.vala b/src/functions.vala +index cf7fefc..9b4d82a 100644 +--- a/src/functions.vala ++++ b/src/functions.vala +@@ -102,10 +102,7 @@ namespace SwayNotificationCenter { + + public static string get_style_path (owned string ? custom_path, + bool only_system = false) { +- string[] paths = { +- // Fallback location. Specified in postinstall.py +- "/usr/local/etc/xdg/swaync/style.css" +- }; ++ string[] paths = {}; + if (custom_path != null && custom_path.length > 0) { + // Replaces the home directory relative path with a absolute path + if (custom_path.get (0) == '~') { +@@ -123,7 +120,9 @@ namespace SwayNotificationCenter { + paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), + path, "swaync/style.css"); + } +- ++ // Fallback location. Specified in postinstall.py. Mostly for Debian ++ paths += "/usr/local/etc/xdg/swaync/style.css"; ++ + string path = ""; + foreach (string try_path in paths) { + if (File.new_for_path (try_path).query_exists ()) { +@@ -140,10 +139,7 @@ namespace SwayNotificationCenter { + } + + public static string get_config_path (owned string ? custom_path) { +- string[] paths = { +- // Fallback location. Specified in postinstall.py +- "/usr/local/etc/xdg/swaync/config.json" +- }; ++ string[] paths = {}; + if (custom_path != null && custom_path.length > 0) { + // Replaces the home directory relative path with a absolute path + if (custom_path.get (0) == '~') { +@@ -158,7 +154,9 @@ namespace SwayNotificationCenter { + paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), + path, "swaync/config.json"); + } +- ++ // Fallback location. Specified in postinstall.py. Mostly for Debian ++ paths += "/usr/local/etc/xdg/swaync/config.json"; ++ + string path = ""; + foreach (string try_path in paths) { + if (File.new_for_path (try_path).query_exists ()) { |