xpano: 0.16.1 -> 0.17.0

This commit is contained in:
Tomas Krupka
2023-11-05 12:16:29 -08:00
committed by Jonathan Ringer
parent 2578eced62
commit 3579184dd6
2 changed files with 4 additions and 26 deletions
+4 -8
View File
@@ -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; {
@@ -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"