From 86be73ea85213174b51a63bfed23a364f7da9e90 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 26 Jul 2024 09:33:59 +0300 Subject: [PATCH 1/4] kdePackages.appstream-qt: fix up cmake file more --- pkgs/development/libraries/appstream/qt.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 1916774b8cfc..4699c7ce934e 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -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 // { From 0481587e3594e99ce4a47cb183a3c8f427a0afd5 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 26 Jul 2024 09:34:25 +0300 Subject: [PATCH 2/4] bazarr: use libarchive instead of unar unar is ObjC, doesn't build currently and is largely dead. Bazarr only uses it to unpack RAR archives, so just give it libarchive bsdtar instead, which can handle any reasonable archive, is not unfree and is not dead. --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index e30beee899ef..daa8f55e87cb 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -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 { From bb292ebc85fb801dba55a79f15a938f621f19313 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 26 Jul 2024 09:54:26 +0300 Subject: [PATCH 3/4] kanidm: allow dead code warnings --- pkgs/by-name/ka/kanidm/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index de9694227fcd..855bd8a12526 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -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. From c3943851a180f0036da85eb3631fdbfc32171914 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 26 Jul 2024 10:14:34 +0300 Subject: [PATCH 4/4] kdePackages.kimageformats: explicitly add libavif dependencies These should be propagated, but it's too late in the cycle to change that. --- pkgs/kde/frameworks/kimageformats/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix index 21c84cb56992..e15c863003a8 100644 --- a/pkgs/kde/frameworks/kimageformats/default.nix +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -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]; }