diff options
Diffstat (limited to 'pkgs/applications/graphics/xpano')
-rw-r--r-- | pkgs/applications/graphics/xpano/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/graphics/xpano/skip_prefix_check.patch | 18 |
2 files changed, 4 insertions, 26 deletions
diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index a2ecaec7c37a2..c52d729f9b51a 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,21 +15,16 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "1f95spf7bbbdvbr4gqfyrs161049jj1wnkvf5wgsd0ga3vb15mcj"; + sha256 = "aKO9NYHFjb69QopseNOJvUvvVT1povP9tyGSOHJFWVo="; fetchSubmodules = true; }; - patches = [ - # force install desktop + icon files - ./skip_prefix_check.patch - ]; - nativeBuildInputs = [ cmake ninja @@ -42,7 +37,7 @@ stdenv.mkDerivation rec { SDL2 gtk3 spdlog - # exiv2 # TODO: enable when 0.28.0 is available + exiv2 ]; checkInputs = [ @@ -53,6 +48,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTING=ON" + "-DXPANO_INSTALL_DESKTOP_FILES=ON" ]; meta = with lib; { diff --git a/pkgs/applications/graphics/xpano/skip_prefix_check.patch b/pkgs/applications/graphics/xpano/skip_prefix_check.patch deleted file mode 100644 index 496cbc718bef7..0000000000000 --- a/pkgs/applications/graphics/xpano/skip_prefix_check.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -167,7 +167,6 @@ install(FILES - TYPE BIN - ) - --if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") - install(FILES - "misc/build/linux/xpano.desktop" - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications" -@@ -184,7 +183,6 @@ if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") - "misc/build/linux/cz.krupkat.Xpano.metainfo.xml" - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo" - ) --endif() - - install(DIRECTORY - "${CMAKE_SOURCE_DIR}/misc/assets" |