nix 23.11 :O
parent
5cbd001a3e
commit
2f1bbe5269
@ -1,10 +0,0 @@
|
|||||||
self: super: {
|
|
||||||
ciscoPacketTracer8 = self.ciscoPacketTracer8.overrideAttrs(e: rec {
|
|
||||||
desktopItem = e.desktopItem.override (d: {
|
|
||||||
exec = "QT_PLUGIN_PATH="" ${d.exec} --no-sandbox";
|
|
||||||
});
|
|
||||||
|
|
||||||
installPhase = builtins.replaceStrings [ "${e.desktopItem}" ] [ "${desktopItem}" ] e.installPhase;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
with import <nixpkgs> { };
|
|
||||||
let
|
|
||||||
isCross = stdenv.buildPlatform != stdenv.hostPlatform;
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "libaom";
|
|
||||||
version = "3.6.0";
|
|
||||||
|
|
||||||
src = fetchzip {
|
|
||||||
url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
|
|
||||||
sha256 = "sha256-tt19UCsZP99rq6BYBSzSHecyIu4CiimD+P1f3CY2QEU=";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./outputs.patch ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
yasm perl cmake pkg-config python3
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
# build uses `git describe` to set the build version
|
|
||||||
cat > $NIX_BUILD_TOP/git << "EOF"
|
|
||||||
#!${stdenv.shell}
|
|
||||||
echo v${version}
|
|
||||||
EOF
|
|
||||||
chmod +x $NIX_BUILD_TOP/git
|
|
||||||
export PATH=$NIX_BUILD_TOP:$PATH
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Configuration options:
|
|
||||||
# https://aomedia.googlesource.com/aom/+/refs/heads/master/build/cmake/aom_config_defaults.cmake
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
|
||||||
"-DCONFIG_SHARED=1"
|
|
||||||
"-DSTATIC_LINK_JXL=0"
|
|
||||||
"-DENABLE_TESTS=OFF"
|
|
||||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
|
||||||
# CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
|
|
||||||
"-DCONFIG_RUNTIME_CPU_DETECT=0"
|
|
||||||
] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [
|
|
||||||
"-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as"
|
|
||||||
] ++ lib.optionals stdenv.isAarch32 [
|
|
||||||
# armv7l-hf-multiplatform does not support NEON
|
|
||||||
# see lib/systems/platform.nix
|
|
||||||
"-DENABLE_NEON=0"
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "out" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Alliance for Open Media AV1 codec library";
|
|
||||||
longDescription = ''
|
|
||||||
Libaom is the reference implementation of the AV1 codec from the Alliance
|
|
||||||
for Open Media. It contains an AV1 library as well as applications like
|
|
||||||
an encoder (aomenc) and a decoder (aomdec).
|
|
||||||
'';
|
|
||||||
homepage = "https://aomedia.org/av1-features/get-started/";
|
|
||||||
changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG";
|
|
||||||
maintainers = with maintainers; [ primeos kiloreux dandellion ];
|
|
||||||
platforms = platforms.all;
|
|
||||||
outputsToInstall = [ ];
|
|
||||||
license = licenses.bsd2;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
|
|
||||||
index 0bd2bf035..5cf5acea8 100644
|
|
||||||
--- a/build/cmake/aom_install.cmake
|
|
||||||
+++ b/build/cmake/aom_install.cmake
|
|
||||||
@@ -42,8 +42,8 @@ macro(setup_aom_install_targets)
|
|
||||||
-DAOM_ROOT=${AOM_ROOT}
|
|
||||||
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
|
|
||||||
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
|
|
||||||
- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
|
||||||
+ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
|
|
||||||
+ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
|
|
||||||
-DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
|
|
||||||
-DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
|
|
||||||
-DCONFIG_TUNE_VMAF=${CONFIG_TUNE_VMAF}
|
|
||||||
@@ -84,12 +84,12 @@ macro(setup_aom_install_targets)
|
|
||||||
# Setup the install rules. install() will automatically prepend
|
|
||||||
# CMAKE_INSTALL_PREFIX to relative paths
|
|
||||||
install(FILES ${AOM_INSTALL_INCS}
|
|
||||||
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aom")
|
|
||||||
+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom")
|
|
||||||
install(FILES "${AOM_PKG_CONFIG_FILE}"
|
|
||||||
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
|
||||||
+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
|
|
||||||
install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS}
|
|
||||||
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
|
|
||||||
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
||||||
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
|
||||||
+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
|
|
||||||
+ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
|
|
||||||
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake
|
|
||||||
index e8fff2e77..b8a73aad4 100644
|
|
||||||
--- a/build/cmake/pkg_config.cmake
|
|
||||||
+++ b/build/cmake/pkg_config.cmake
|
|
||||||
@@ -11,8 +11,8 @@
|
|
||||||
cmake_minimum_required(VERSION 3.5)
|
|
||||||
|
|
||||||
set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "CMAKE_INSTALL_PREFIX"
|
|
||||||
- "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR"
|
|
||||||
- "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME"
|
|
||||||
+ "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_FULL_INCLUDEDIR"
|
|
||||||
+ "CMAKE_INSTALL_FULL_LIBDIR" "CMAKE_PROJECT_NAME"
|
|
||||||
"CONFIG_MULTITHREAD" "HAVE_PTHREAD_H")
|
|
||||||
|
|
||||||
foreach(arg ${REQUIRED_ARGS})
|
|
||||||
@@ -35,15 +35,15 @@ else()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Write pkg-config info.
|
|
||||||
-set(prefix "${CMAKE_INSTALL_PREFIX}")
|
|
||||||
-set(bindir "${CMAKE_INSTALL_BINDIR}")
|
|
||||||
-set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
||||||
-set(libdir "${CMAKE_INSTALL_LIBDIR}")
|
|
||||||
+get_filename_component(prefix "${CMAKE_INSTALL_FULL_INCLUDEDIR}" DIRECTORY)
|
|
||||||
+get_filename_component(exec_prefix "${CMAKE_INSTALL_FULL_LIBDIR}" DIRECTORY)
|
|
||||||
+get_filename_component(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}" NAME)
|
|
||||||
+get_filename_component(libdir "${CMAKE_INSTALL_FULL_LIBDIR}" NAME)
|
|
||||||
set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
|
|
||||||
string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
|
|
||||||
file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
|
|
||||||
file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
|
|
||||||
-file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}\n")
|
|
||||||
+file(APPEND "${pkgconfig_file}" "exec_prefix=${exec_prefix}\n")
|
|
||||||
file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/${includedir}\n")
|
|
||||||
file(APPEND "${pkgconfig_file}" "libdir=\${exec_prefix}/${libdir}\n\n")
|
|
||||||
file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,22 +0,0 @@
|
|||||||
diff --git a/Cargo.toml b/Cargo.toml
|
|
||||||
index 4c7161cb..929e0f59 100644
|
|
||||||
--- a/Cargo.toml
|
|
||||||
+++ b/Cargo.toml
|
|
||||||
@@ -31,7 +31,7 @@ mediacodec = ["scrap/mediacodec"]
|
|
||||||
linux_headless = ["pam"]
|
|
||||||
virtual_display_driver = ["virtual_display"]
|
|
||||||
plugin_framework = []
|
|
||||||
-linux-pkg-config = ["magnum-opus/linux-pkg-config", "scrap/linux-pkg-config"]
|
|
||||||
+linux-pkg-config = ["scrap/linux-pkg-config"]
|
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ sha2 = "0.10"
|
|
||||||
repng = "0.2"
|
|
||||||
parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" }
|
|
||||||
runas = "1.0"
|
|
||||||
-magnum-opus = { git = "https://github.com/rustdesk/magnum-opus" }
|
|
||||||
+magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" }
|
|
||||||
dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
|
|
||||||
rubato = { version = "0.12", optional = true }
|
|
||||||
samplerate = { version = "0.2", optional = true }
|
|
||||||
@ -1,135 +0,0 @@
|
|||||||
with import <nixpkgs> { config.allowUnfree = true; };
|
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
pname = "rustdesk";
|
|
||||||
version = "d8cf18e";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "rustdesk";
|
|
||||||
repo = "rustdesk";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "sha256-apLK1O60EbN84w67qCAaPVrJ7/N+yqDuksRPQYqYwlA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
|
||||||
|
|
||||||
cargoLock = {
|
|
||||||
lockFile = ./Cargo.lock;
|
|
||||||
outputHashes = {
|
|
||||||
"confy-0.4.0-2" = "sha256-vHdXdJlAK7l+Gsp7W2/OpJz9KKD9PYx6AGONDuqtsZw=";
|
|
||||||
"evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
|
|
||||||
"hwcodec-0.1.0" = "sha256-u/+J2dVSHmvYSp2cd2y5rW5gWTf6JhIjvxh2xS9x01A=";
|
|
||||||
"impersonate_system-0.1.0" = "sha256-qbaTw9gxMKDjX5pKdUrKlmIxCxWwb99YuWPDvD2A3kY=";
|
|
||||||
"keepawake-0.4.3" = "sha256-1zui2955rYzYAtKrs7pTJf0ETJGKvf8zNvcg0SCZk8Q=";
|
|
||||||
"magnum-opus-0.4.0" = "sha256-U5uuN4YolOYDnFNbtPpwYefcBDTUUyioui0UCcW8dyo=";
|
|
||||||
"mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk=";
|
|
||||||
"pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q=";
|
|
||||||
"parity-tokio-ipc-0.7.3-2" = "sha256-WXDKcDBaJuq4K9gjzOKMozePOFiVX0EqYAFamAz/Yvw=";
|
|
||||||
"rdev-0.5.0-2" = "sha256-O1d3klGVnXhzb5rj2sH9u+z+iPmqVqkaHdxYiMiD+GA=";
|
|
||||||
"rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM=";
|
|
||||||
"sciter-rs-0.5.57" = "sha256-ZZnZDhMjK0LjgmK0da1yvB0uoKueLhhhQtzmjoN+1R0=";
|
|
||||||
"tao-0.19.1" = "sha256-Rnj4JC3u7avB9mvpRZMO9iq7Icb2HsGdQg3ZRYhsC08=";
|
|
||||||
"tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU=";
|
|
||||||
"tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY=";
|
|
||||||
"tray-icon-0.5.1" = "sha256-1VyUg8V4omgdRIYyXhfn8kUvhV5ef6D2cr2Djz2uQyc=";
|
|
||||||
"x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Change magnus-opus version to upstream so that it does not use
|
|
||||||
# vcpkg for libopus since it does not work.
|
|
||||||
cargoPatches = [
|
|
||||||
./cargo.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
# Manually simulate a vcpkg installation so that it can link the libaries
|
|
||||||
# properly.
|
|
||||||
postUnpack =
|
|
||||||
let
|
|
||||||
vcpkg_target = "x64-linux";
|
|
||||||
|
|
||||||
updates_vcpkg_file = writeText "update_vcpkg_rustdesk"
|
|
||||||
''
|
|
||||||
Package : libyuv
|
|
||||||
Architecture : ${vcpkg_target}
|
|
||||||
Version : 1787
|
|
||||||
Status : is installed
|
|
||||||
|
|
||||||
Package : libvpx
|
|
||||||
Architecture : ${vcpkg_target}
|
|
||||||
Version : 8.0.0
|
|
||||||
Status : is installed
|
|
||||||
|
|
||||||
Package : libaom
|
|
||||||
Architecture : ${vcpkg_target}
|
|
||||||
Version : 3.6.0
|
|
||||||
Status : is installed
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
''
|
|
||||||
export VCPKG_ROOT="$TMP/vcpkg";
|
|
||||||
|
|
||||||
mkdir -p $VCPKG_ROOT/.vcpkg-root
|
|
||||||
mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
|
|
||||||
mkdir -p $VCPKG_ROOT/installed/vcpkg/updates
|
|
||||||
ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status
|
|
||||||
mkdir -p $VCPKG_ROOT/installed/vcpkg/info
|
|
||||||
touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1787_${vcpkg_target}.list
|
|
||||||
touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_8.0.0_${vcpkg_target}.list
|
|
||||||
touch $VCPKG_ROOT/installed/vcpkg/info/libaom_3.6.0_${vcpkg_target}.list
|
|
||||||
|
|
||||||
ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
|
||||||
ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
|
||||||
ln -s ${(import ../libaom).out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
|
||||||
'';
|
|
||||||
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ];
|
|
||||||
buildInputs = [ (import ../libaom) ] ++ [ libxkbcommon alsa-lib pulseaudio xorg.libXfixes xorg.libxcb xdotool gtk3 libvpx libopus xorg.libXtst libyuv gst_all_1.gstreamer gst_all_1.gst-plugins-good gst_all_1.gst-plugins-base ];
|
|
||||||
|
|
||||||
# Checks require an active X display.
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
desktopItems = [
|
|
||||||
(makeDesktopItem {
|
|
||||||
name = "rustdesk";
|
|
||||||
exec = meta.mainProgram;
|
|
||||||
icon = "rustdesk";
|
|
||||||
desktopName = "RustDesk";
|
|
||||||
comment = meta.description;
|
|
||||||
genericName = "Remote Desktop";
|
|
||||||
categories = [ "Network" ];
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
rm Cargo.lock
|
|
||||||
ln -s ${./Cargo.lock} Cargo.lock
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Add static ui resources and libsciter to same folder as binary so that it
|
|
||||||
# can find them.
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $out/{share/src,lib/rustdesk}
|
|
||||||
|
|
||||||
# so needs to be next to the executable
|
|
||||||
mv $out/bin/rustdesk $out/lib/rustdesk
|
|
||||||
ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk
|
|
||||||
|
|
||||||
makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \
|
|
||||||
--chdir "$out/share"
|
|
||||||
|
|
||||||
cp -a $src/src/ui $out/share/src
|
|
||||||
|
|
||||||
install -Dm0644 $src/res/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Yet another remote desktop software";
|
|
||||||
homepage = "https://rustdesk.com";
|
|
||||||
license = licenses.gpl3Only;
|
|
||||||
maintainers = with maintainers; [ ];
|
|
||||||
platforms = [ "x86_64-linux" ];
|
|
||||||
mainProgram = "rustdesk";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue