diff options
| author | toastal <toastal@posteo.net> | 2022-12-28 15:20:24 +0700 |
|---|---|---|
| committer | toastal <toastal@posteo.net> | 2022-12-28 15:24:40 +0700 |
| commit | d6f100fbf022c7ff28f6e98e54eff94e489ab265 (patch) | |
| tree | 87e5a30f95632b5c713c7497b16f65b60feb0b6e | |
| parent | 3c9246399df09f25a0891fffa235a0d4d6ae8074 (diff) | |
| download | nixpkgs-d6f100fbf022c7ff28f6e98e54eff94e489ab265.tar nixpkgs-d6f100fbf022c7ff28f6e98e54eff94e489ab265.tar.gz nixpkgs-d6f100fbf022c7ff28f6e98e54eff94e489ab265.tar.bz2 nixpkgs-d6f100fbf022c7ff28f6e98e54eff94e489ab265.tar.lz nixpkgs-d6f100fbf022c7ff28f6e98e54eff94e489ab265.tar.xz nixpkgs-d6f100fbf022c7ff28f6e98e54eff94e489ab265.tar.zst nixpkgs-d6f100fbf022c7ff28f6e98e54eff94e489ab265.zip | |
hugin: 2021.0.0 → 2022.0.0
https://hugin.sourceforge.io/releases/2022.0.0/en.shtml
| -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 389d5d4294b..f4d424b3fc3 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 d38e07a595e..00000000000 --- 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()) |