Commit 3579184d authored by Tomas Krupka's avatar Tomas Krupka Committed by Jonathan Ringer
Browse files

xpano: 0.16.1 -> 0.17.0

parent 2578eced

pkgs/applications/graphics/xpano/default.nix

+4 −8
Original line number Diff line number Diff line
@@ -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; {

pkgs/applications/graphics/xpano/skip_prefix_check.patch

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
--- 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"