tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #208073 from toastal/hugin-2022

hugin: 2021.0.0 → 2022.0.0

authored by Christoph Hrdinka and committed by GitHub ee014dbc aca6ac32

+2 -22
unified split
+2 -8
pkgs/applications/graphics/hugin/default.nix
··· 36 36 37 37 stdenv.mkDerivation rec { 38 38 pname = "hugin"; 39 - version = "2021.0.0"; 39 + version = "2022.0.0"; 40 40 41 41 src = fetchurl { 42 42 url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; 43 - sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; 43 + sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; 44 44 }; 45 - 46 - patches = [ 47 - # committed upstream but unreleased: 48 - # https://sourceforge.net/p/hugin/hugin/ci/edfddc6070ca6d4223d359fb4b38273a5aed2f2d 49 - ./dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch 50 - ]; 51 45 52 46 buildInputs = [ 53 47 boost
-14
pkgs/applications/graphics/hugin/dont-crash-if-XDG_DATA_DIRS-not-set-edfddc6070ca6d4223d359fb4b38273a5aed2f2d.patch
··· 1 - --- a/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:26.873574924 -0800 2 - +++ b/src/hugin_base/hugin_utils/utils.cpp 2022-12-05 22:19:09.069575641 -0800 3 - @@ -472,9 +472,9 @@ 4 - #else 5 - #ifdef USE_XDG_DIRS 6 - char *xdgDataDir = getenv("XDG_DATA_HOME"); 7 - - if (strlen(xdgDataDir) == 0) 8 - + if (xdgDataDir == NULL || strlen(xdgDataDir) == 0) 9 - { 10 - - // no XDG_DATA_HOME enviroment variable set 11 - + // no XDG_DATA_HOME enviroment variable set or empty variable 12 - // use $HOME/.local/share instead 13 - const std::string homeDir = GetHomeDir(); 14 - if (homeDir.empty())