mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 15:27:20 +03:00
prl-tools: 18.0.3-53079 -> 18.1.0-53311
This commit is contained in:
parent
3db0fa106d
commit
521e2f5089
@ -24,20 +24,16 @@
|
||||
assert (!libsOnly) -> kernel != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "18.0.3-53079";
|
||||
version = "18.1.0-53311";
|
||||
pname = "prl-tools";
|
||||
|
||||
# We download the full distribution to extract prl-tools-lin.iso from
|
||||
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
|
||||
src = fetchurl {
|
||||
url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg";
|
||||
sha256 = "sha256-z9B2nhcTSZr3L30fa54zYi6WnonQ2wezHoneT2tQWAc=";
|
||||
sha256 = "sha256-2ROPFIDoV2/sMVsVhcSyn0m1QVMCNb399WzKd/cozws=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (lib.versionAtLeast kernel.version "6.0") [
|
||||
./prl-tools-6.0.patch
|
||||
];
|
||||
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
|
||||
nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ]
|
||||
@ -51,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
inherit libsOnly;
|
||||
|
||||
unpackPhase = ''
|
||||
undmg "${src}"
|
||||
undmg $src
|
||||
export sourceRoot=prl-tools-build
|
||||
7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot
|
||||
if test -z "$libsOnly"; then
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c
|
||||
index baa8a19..6788791 100644
|
||||
--- a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c
|
||||
+++ b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c
|
||||
@@ -306,7 +306,7 @@ int seq_show(struct seq_file *file, void *data)
|
||||
char buf[BDEVNAME_SIZE];
|
||||
|
||||
fsb = list_entry((struct list_head*)data, struct frozen_sb, list);
|
||||
- bdevname(fsb->sb->s_bdev, buf);
|
||||
+ snprintf(buf, sizeof(buf), "%pg", fsb->sb->s_bdev);
|
||||
seq_printf(file, "%s\n", buf);
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user