diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-20 09:38:45 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-20 09:38:45 +0100 |
commit | 32767d139f28fd3c00d687c04ec406258f7341e7 (patch) | |
tree | b049aa5d798a9fa2555882c788592a0640928ba2 /pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch | |
parent | 28d983fe25bcf853dfd38663f333d4c522f613cc (diff) | |
parent | e20188f181ca51882984daaee237a95f2fc5e7c9 (diff) | |
download | nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.gz nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.bz2 nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.lz nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.xz nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.zst nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.zip |
Merge branch 'staging-next'
This round is without the systemd CVE, as we don't have binaries for that yet. BTW, I just ignore darwin binaries these days, as I'd have to wait for weeks for them.
Diffstat (limited to 'pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch')
-rw-r--r-- | pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch new file mode 100644 index 00000000000..2229302cab7 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/plugins/datetime/tz.h ++++ b/plugins/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include <glib.h> + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; |