Re: [Nix-dev] *.desktop not found in build/data

2017-03-14 Thread Markus Schneider
I suppose the problem is the following cmake macro (Translations.cmake):

macro (configure_file_translation SOURCE RESULT PO_DIR)
find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
set(EXTRA_PO_DIR ${PO_DIR}/extra/)
get_filename_component(EXTRA_PO_DIR ${EXTRA_PO_DIR} ABSOLUTE)

# Intltool can't create a new directory.
get_filename_component(RESULT_DIRECTORY ${RESULT} DIRECTORY)
file(MAKE_DIRECTORY ${RESULT_DIRECTORY})

set (INTLTOOL_FLAG "")
if (${SOURCE} MATCHES ".desktop")
set (INTLTOOL_FLAG "--desktop-style")
elseif (${SOURCE} MATCHES ".gschema")
set (INTLTOOL_FLAG "--schemas-style")
elseif (${SOURCE} MATCHES ".xml")
set (INTLTOOL_FLAG "--xml-style")
endif ()
execute_process (WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND 
${INTLTOOL_MERGE_EXECUTABLE} --quiet ${INTLTOOL_FLAG} ${EXTRA_PO_DIR} ${SOURCE} 
${RESULT})
endmacro ()

which is called as 

include (Translations)
configure_file_translation(${CMAKE_SOURCE_DIR}/data/open-pantheon-terminal-here.desktop.in
 ${CMAKE_BINARY_DIR}/data/open-pantheon-terminal-here.desktop 
${CMAKE_SOURCE_DIR}/po/)
configure_file_translation(${CMAKE_SOURCE_DIR}/data/org.pantheon.terminal.desktop.in
 ${CMAKE_BINARY_DIR}/data/org.pantheon.terminal.desktop ${CMAKE_SOURCE_DIR}/po/)
configure_file_translation(${CMAKE_SOURCE_DIR}/data/pantheon-terminal.appdata.xml.in
 ${CMAKE_BINARY_DIR}/data/pantheon-terminal.appdata.xml ${CMAKE_SOURCE_DIR}/po/)

in CMakeLists.txt. However I still can't figure out how to solve this problem.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-dev] *.desktop not found in build/data

2017-03-13 Thread Markus Schneider

I am new to nix trying to contribute by upgrading pantheon-terminal to version 0.4.

The build seems to be fine, however I get an error in the installPhase:

 

-- Install configuration: "Release"
-- Installing: /nix/store/l6j08sdvz6l10sngxnj6kbish18zgavb-pantheon-terminal-0.4.0.3/share/glib-2.0/schemas/org.pantheon.terminal.gschema.xml
-- Compiling GSettings schemas
-- Installing: /nix/store/l6j08sdvz6l10sngxnj6kbish18zgavb-pantheon-terminal-0.4.0.3/bin/pantheon-terminal
CMake Error at cmake_install.cmake:72 (file):
  file INSTALL cannot find
  "/tmp/me/nix-build-pantheon-terminal-0.4.0.3.drv-0/pantheon-terminal-0.4.0.3/build/data/org.pantheon.terminal.desktop".

 

If I use nix-shell and run the build I can confirm that the *.desktop files are in ./build/data/

What is the issue here?

 

gist: https://gist.github.com/anonymous/f96d9040447d15d3a51390d515e78a08

 

Thanks

- Markus

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev