Loading pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch +7 −7 Original line number Diff line number Diff line diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b05ab0..81e31f5 100644 index 574b354..1a62874 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,16 +236,6 @@ endif() @@ -254,16 +254,6 @@ endif() if (''${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(MACOSX_BUNDLE_LIBS) - if (OPENSSL_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib) - endif() - if (TAGLIB_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/taglib/lib/libtag.1.dylib) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/taglib/lib/libtag.2.dylib) - endif() - if (FUSE_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/lib/libosxfuse.2.dylib) - endif() - set(MACOSX_BUNDLE_LIBS_INSTALL) set(MACOSX_BUNDLE_ROOT_DIR "''${CMAKE_INSTALL_PREFIX}/''${CMAKE_PROJECT_NAME}.app") message(STATUS "bundle root dir: ''${MACOSX_BUNDLE_ROOT_DIR}") set(MACOSX_BUNDLE_ROOT_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}.app") message(STATUS "bundle root dir: ${MACOSX_BUNDLE_ROOT_DIR}") pkgs/tools/filesystems/android-file-transfer/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -14,13 +14,13 @@ mkDerivation rec { pname = "android-file-transfer"; version = "4.3"; version = "4.4"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU="; sha256 = "sha256-1euoWM9KMauOkAp7g1FvY4olMiOg+La/Uk1QlQ3mKi8="; }; patches = [ ./darwin-dont-vendor-dependencies.patch ]; Loading Loading
pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch +7 −7 Original line number Diff line number Diff line diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b05ab0..81e31f5 100644 index 574b354..1a62874 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,16 +236,6 @@ endif() @@ -254,16 +254,6 @@ endif() if (''${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(MACOSX_BUNDLE_LIBS) - if (OPENSSL_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib) - endif() - if (TAGLIB_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/taglib/lib/libtag.1.dylib) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/taglib/lib/libtag.2.dylib) - endif() - if (FUSE_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/lib/libosxfuse.2.dylib) - endif() - set(MACOSX_BUNDLE_LIBS_INSTALL) set(MACOSX_BUNDLE_ROOT_DIR "''${CMAKE_INSTALL_PREFIX}/''${CMAKE_PROJECT_NAME}.app") message(STATUS "bundle root dir: ''${MACOSX_BUNDLE_ROOT_DIR}") set(MACOSX_BUNDLE_ROOT_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}.app") message(STATUS "bundle root dir: ${MACOSX_BUNDLE_ROOT_DIR}")
pkgs/tools/filesystems/android-file-transfer/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -14,13 +14,13 @@ mkDerivation rec { pname = "android-file-transfer"; version = "4.3"; version = "4.4"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU="; sha256 = "sha256-1euoWM9KMauOkAp7g1FvY4olMiOg+La/Uk1QlQ3mKi8="; }; patches = [ ./darwin-dont-vendor-dependencies.patch ]; Loading