From fa7b0d03d143238646ef7d6b968074535fdd60af Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 9 Jun 2023 20:35:51 +0200 Subject: [PATCH] libsidplayfp: 2.4.2 -> 2.5.0 --- .../libraries/libsidplayfp/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 84d0f01c154..194da312161 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, makeFontsConf , nix-update-script , autoreconfHook , pkg-config @@ -16,28 +17,30 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds="; + sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA="; }; postPatch = '' patchShebangs . ''; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config perl xa ] ++ lib.optionals docSupport [ doxygen graphviz ]; buildInputs = [ libgcrypt libexsid ]; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - nativeCheckInputs = [ unittest-cpp ]; + checkInputs = [ unittest-cpp ]; enableParallelBuilding = true; @@ -54,6 +57,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional doCheck "--enable-tests"; + FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); + + preBuild = '' + # Reduce noise from fontconfig during doc building + export XDG_CACHE_HOME=$TMPDIR + ''; + postInstall = lib.optionalString docSupport '' mkdir -p $doc/share/doc/libsidplayfp mv docs/html $doc/share/doc/libsidplayfp/