pyrox.dev / nixpkgs
lol
fork atom

deepin.dde-file-manager: 6.0.31 -> 6.0.40

authored by rewine and committed by rewine 567fdca8 4cdb8ae2

+8 -13
unified split
+5 -10
pkgs/desktops/deepin/core/dde-file-manager/default.nix
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 - , fetchpatch 5 , runtimeShell 6 , dtkwidget 7 , qt5integration ··· 44 45 stdenv.mkDerivation rec { 46 pname = "dde-file-manager"; 47 - version = "6.0.31"; 48 49 src = fetchFromGitHub { 50 owner = "linuxdeepin"; 51 repo = pname; 52 rev = version; 53 - hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM="; 54 }; 55 56 nativeBuildInputs = [ ··· 63 dontWrapGApps = true; 64 65 patches = [ 66 - ./use_v23_dbus_interface.diff 67 - 68 - (fetchpatch { 69 - name = "use-pkgconfig-to-check-mount.patch"; 70 - url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch"; 71 - hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU="; 72 - }) 73 ]; 74 75 postPatch = '' ··· 132 133 cmakeFlags = [ 134 "-DVERSION=${version}" 135 ]; 136 137 enableParallelBuilding = true;
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 , runtimeShell 5 , dtkwidget 6 , qt5integration ··· 43 44 stdenv.mkDerivation rec { 45 pname = "dde-file-manager"; 46 + version = "6.0.40"; 47 48 src = fetchFromGitHub { 49 owner = "linuxdeepin"; 50 repo = pname; 51 rev = version; 52 + hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA="; 53 }; 54 55 nativeBuildInputs = [ ··· 62 dontWrapGApps = true; 63 64 patches = [ 65 + ./patch_check_v23_interface.diff 66 ]; 67 68 postPatch = '' ··· 125 126 cmakeFlags = [ 127 "-DVERSION=${version}" 128 + "-DNIX_DEEPIN_VERSION=23" 129 + "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" 130 ]; 131 132 enableParallelBuilding = true;
+3 -3
pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff
··· 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index e93d3ad..94e3eca 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 - @@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 6 endif() 7 8 #Indentify the version 9 -if (${DEEPIN_OS_VERSION} MATCHES "23") 10 - +if (TRUE) 11 add_definitions(-DCOMPILE_ON_V23) 12 set(COMPLIE_ON_V23 TRUE) 13 message("COMPILE ON v23")
··· 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index 8a8cfb079..34092aa57 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 + @@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 6 endif() 7 8 #Indentify the version 9 -if (${DEEPIN_OS_VERSION} MATCHES "23") 10 + +if (${NIX_DEEPIN_VERSION} MATCHES "23") 11 add_definitions(-DCOMPILE_ON_V23) 12 set(COMPLIE_ON_V23 TRUE) 13 message("COMPILE ON v23")