pyrox.dev / nixpkgs
lol
fork atom

android-file-transfer: 4.3 -> 4.4

Dominik Xaver Hörl 8d7fd15d bd748ffa

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