uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
37
pkgs/applications/misc/keepassx/darwin.patch
Normal file
37
pkgs/applications/misc/keepassx/darwin.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 74b1a7ff..0a713a32 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -307,6 +307,7 @@ if(MINGW)
|
||||
set(PLUGIN_INSTALL_DIR ".")
|
||||
set(DATA_INSTALL_DIR "share")
|
||||
elseif(APPLE AND WITH_APP_BUNDLE)
|
||||
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
|
||||
set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
|
||||
set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man")
|
||||
set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
|
||||
@@ -470,11 +470,6 @@ set(CMAKE_AUTORCC ON)
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_MACOSX_RPATH TRUE)
|
||||
- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
|
||||
- if(NOT MACDEPLOYQT_EXE)
|
||||
- message(FATAL_ERROR "macdeployqt is required to build on macOS")
|
||||
- endif()
|
||||
- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
|
||||
set(MACDEPLOYQT_EXTRA_BINARIES "")
|
||||
elseif(WIN32)
|
||||
find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
|
||||
diff --git a/src/post_install/CMakeLists.txt b/src/post_install/CMakeLists.txt
|
||||
index 359c891f..a6a061a3 100644
|
||||
--- a/src/post_install/CMakeLists.txt
|
||||
+++ b/src/post_install/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
# The install commands in this subdirectory will be executed after all the install commands in the
|
||||
# current scope are ran. It is required for correct functtioning of macdeployqt.
|
||||
|
||||
-if(APPLE AND WITH_APP_BUNDLE)
|
||||
+if(FALSE)
|
||||
# Run macdeloyqt on the main app and any extra binaries and plugins as specified by the
|
||||
# _MACDEPLOYQT_EXTRA_BINARIES global property.
|
||||
# All install(TARGETS) calls should have already been called.
|
||||
Loading…
Add table
Add a link
Reference in a new issue