Merge pull request #330143 from K900/staging-fixes-pile
[staging-next] Assorted fixes I found rebuilding my config against -next
This commit is contained in:
@@ -71,6 +71,9 @@ rustPlatform.buildRustPackage rec {
|
||||
cp -r server/web_ui/pkg $out/ui
|
||||
'';
|
||||
|
||||
# Otherwise build breaks on some unused code
|
||||
env.RUSTFLAGS = "-A dead_code";
|
||||
|
||||
# Not sure what pathological case it hits when compiling tests with LTO,
|
||||
# but disabling it takes the total `cargo check` time from 40 minutes to
|
||||
# around 5 on a 16-core machine.
|
||||
|
||||
@@ -24,9 +24,13 @@ stdenv.mkDerivation {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# AppStreamQt tries to be relocatable, in hacky cmake ways that generally fail
|
||||
# horribly on NixOS. Just hardcode the paths.
|
||||
postFixup = ''
|
||||
sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \
|
||||
-e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@"
|
||||
sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \
|
||||
-e "/IMPORTED_LOCATION/ s@\''${PACKAGE_PREFIX_DIR}@$out@"
|
||||
'';
|
||||
|
||||
passthru = appstream.passthru // {
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
libheif,
|
||||
libjxl,
|
||||
libavif,
|
||||
dav1d,
|
||||
libaom,
|
||||
libyuv,
|
||||
libraw,
|
||||
openexr_3,
|
||||
}:
|
||||
@@ -12,5 +15,5 @@ mkKdeDerivation {
|
||||
|
||||
extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"];
|
||||
extraNativeBuildInputs = [pkg-config];
|
||||
extraBuildInputs = [libheif libjxl libavif libraw openexr_3];
|
||||
extraBuildInputs = [libheif libjxl libavif dav1d libaom libyuv libraw openexr_3];
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unar, ffmpeg, nixosTests }:
|
||||
{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, libarchive, ffmpeg, nixosTests }:
|
||||
|
||||
let
|
||||
runtimeProgDeps = [
|
||||
ffmpeg
|
||||
unar
|
||||
libarchive
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
Reference in New Issue
Block a user