diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/by-name/po/poptracker/assets-path.diff | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/by-name/po/poptracker/assets-path.diff')
-rw-r--r-- | nixpkgs/pkgs/by-name/po/poptracker/assets-path.diff | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/by-name/po/poptracker/assets-path.diff b/nixpkgs/pkgs/by-name/po/poptracker/assets-path.diff new file mode 100644 index 000000000000..7312b407a26f --- /dev/null +++ b/nixpkgs/pkgs/by-name/po/poptracker/assets-path.diff @@ -0,0 +1,12 @@ +diff --git a/src/poptracker.cpp b/src/poptracker.cpp +index dbf477b..6ccfac2 100644 +--- a/src/poptracker.cpp ++++ b/src/poptracker.cpp +@@ -217,6 +217,7 @@ PopTracker::PopTracker(int argc, char** argv, bool cli, const json& args) + Pack::addOverrideSearchPath(os_pathcat(appPath, "user-override")); // portable/system overrides + Assets::addSearchPath(os_pathcat(appPath, "assets")); // system assets + } ++ Assets::addSearchPath("@assets@"); + + _asio = new asio::io_service(); + HTTP::certfile = asset("cacert.pem"); // https://curl.se/docs/caextract.html |