diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/libsidplayfp | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libsidplayfp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 84d0f01c1549..194da3121615 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/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/ |