diff options
author | Christoph Hrdinka <c.github@hrdinka.at> | 2023-01-09 09:59:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-09 09:59:30 +0100 |
commit | ee014dbc8f3556736ea66824bd1c60a19fc0efcf (patch) | |
tree | 1ab05c7bf75284a2959f295122fd0c9cc062d88f /pkgs/applications/graphics | |
parent | aca6ac32695a6d5f69df066175fbd8b770197179 (diff) | |
parent | d6f100fbf022c7ff28f6e98e54eff94e489ab265 (diff) |
Merge pull request #208073 from toastal/hugin-2022
hugin: 2021.0.0 → 2022.0.0
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch | 14 |
2 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 389d5d4294b88..f4d424b3fc30d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -36,19 +36,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2021.0.0"; + version = "2022.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; + sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; }; - patches = [ - # committed upstream but unreleased: - # https://sourceforge.net/p/hugin/hugin/ci/edfddc6070ca6d4223d359fb4b38273a5aed2f2d - ./dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch - ]; - buildInputs = [ boost cairo diff --git a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch b/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch deleted file mode 100644 index d38e07a595e8b..0000000000000 --- a/pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:26.873574924 -0800 -+++ b/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:09.069575641 -0800 -@@ -472,9 +472,9 @@ - #else - #ifdef USE_XDG_DIRS - char *xdgDataDir = getenv("XDG_DATA_HOME"); -- if (strlen(xdgDataDir) == 0) -+ if (xdgDataDir == NULL || strlen(xdgDataDir) == 0) - { -- // no XDG_DATA_HOME enviroment variable set -+ // no XDG_DATA_HOME enviroment variable set or empty variable - // use $HOME/.local/share instead - const std::string homeDir = GetHomeDir(); - if (homeDir.empty()) |