diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/desktops/deepin/core/dde-file-manager | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin/core/dde-file-manager')
| -rw-r--r-- | nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix | 18 | ||||
| -rw-r--r-- | nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff | 13 |
2 files changed, 28 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix index 21d9ac3fa892..a197980c8d74 100644 --- a/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , runtimeShell , dtkwidget , qt5integration @@ -38,17 +39,18 @@ , pcre , udisks2 , libisoburn +, gsettings-qt }: stdenv.mkDerivation rec { pname = "dde-file-manager"; - version = "6.0.23"; + version = "6.0.31"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-H+pCWZ1jj5p3gOKXYyLxSmjCMv5/BPIz5A25JGGzrR8="; + hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM="; }; nativeBuildInputs = [ @@ -60,6 +62,16 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; + patches = [ + ./use_v23_dbus_interface.diff + + (fetchpatch { + name = "use-pkgconfig-to-check-mount.patch"; + url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch"; + hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU="; + }) + ]; + postPatch = '' patchShebangs . @@ -115,11 +127,11 @@ stdenv.mkDerivation rec { pcre udisks2 libisoburn + gsettings-qt ]; cmakeFlags = [ "-DVERSION=${version}" - "-DDEEPIN_OS_VERSION=20" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff b/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff new file mode 100644 index 000000000000..5a42ecd4a1f5 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e93d3ad..94e3eca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + endif() + + #Indentify the version +-if (${DEEPIN_OS_VERSION} MATCHES "23") ++if (TRUE) + add_definitions(-DCOMPILE_ON_V23) + set(COMPLIE_ON_V23 TRUE) + message("COMPILE ON v23") |