freerdp3: 3.12.0 -> 3.14.0 (#387596)
This commit is contained in:
@@ -51,29 +51,24 @@
|
||||
libopus,
|
||||
buildServer ? true,
|
||||
nocaps ? false,
|
||||
AudioToolbox,
|
||||
AVFoundation,
|
||||
Carbon,
|
||||
Cocoa,
|
||||
CoreMedia,
|
||||
withUnfree ? false,
|
||||
|
||||
# tries to compile and run generate_argument_docbook.c
|
||||
withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
|
||||
gnome,
|
||||
gnome-remote-desktop,
|
||||
remmina,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freerdp";
|
||||
version = "3.12.0";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Bbpwfnz8xPyNLZ+UtcYw4arpzGEh3znqncExl4DlByA=";
|
||||
hash = "sha256-Dd7J0QpKNY0cbTldtKkXjBoAJUSCyDf9Pzoah+Ak9Vw=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -154,13 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wayland
|
||||
wayland-scanner
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
AudioToolbox
|
||||
AVFoundation
|
||||
Carbon
|
||||
Cocoa
|
||||
CoreMedia
|
||||
]
|
||||
++ lib.optionals withUnfree [
|
||||
faac
|
||||
];
|
||||
@@ -205,15 +193,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
);
|
||||
|
||||
env.NIX_LDFLAGS = toString (
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-framework AudioToolbox"
|
||||
]
|
||||
);
|
||||
|
||||
passthru.tests = {
|
||||
inherit remmina;
|
||||
inherit (gnome) gnome-remote-desktop;
|
||||
inherit gnome-remote-desktop;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -13394,10 +13394,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
|
||||
};
|
||||
freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix {
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia;
|
||||
};
|
||||
freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix {};
|
||||
})
|
||||
freerdp
|
||||
freerdp3
|
||||
|
||||
Reference in New Issue
Block a user