xpano: 0.16.1 -> 0.17.0

authored by

Tomas Krupka and committed by
Jonathan Ringer
3579184d 2578eced

+4 -26
+4 -8
pkgs/applications/graphics/xpano/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "xpano"; 18 - version = "0.16.1"; 18 + version = "0.17.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "krupkat"; 22 22 repo = pname; 23 23 rev = "v${version}"; 24 - sha256 = "1f95spf7bbbdvbr4gqfyrs161049jj1wnkvf5wgsd0ga3vb15mcj"; 24 + sha256 = "aKO9NYHFjb69QopseNOJvUvvVT1povP9tyGSOHJFWVo="; 25 25 fetchSubmodules = true; 26 26 }; 27 27 28 - patches = [ 29 - # force install desktop + icon files 30 - ./skip_prefix_check.patch 31 - ]; 32 - 33 28 nativeBuildInputs = [ 34 29 cmake 35 30 ninja ··· 42 37 SDL2 43 38 gtk3 44 39 spdlog 45 - # exiv2 # TODO: enable when 0.28.0 is available 40 + exiv2 46 41 ]; 47 42 48 43 checkInputs = [ ··· 53 48 54 49 cmakeFlags = [ 55 50 "-DBUILD_TESTING=ON" 51 + "-DXPANO_INSTALL_DESKTOP_FILES=ON" 56 52 ]; 57 53 58 54 meta = with lib; {
-18
pkgs/applications/graphics/xpano/skip_prefix_check.patch
··· 1 - --- a/CMakeLists.txt 2 - +++ b/CMakeLists.txt 3 - @@ -167,7 +167,6 @@ install(FILES 4 - TYPE BIN 5 - ) 6 - 7 - -if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") 8 - install(FILES 9 - "misc/build/linux/xpano.desktop" 10 - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications" 11 - @@ -184,7 +183,6 @@ if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") 12 - "misc/build/linux/cz.krupkat.Xpano.metainfo.xml" 13 - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo" 14 - ) 15 - -endif() 16 - 17 - install(DIRECTORY 18 - "${CMAKE_SOURCE_DIR}/misc/assets"