mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-21 20:34:06 +00:00
Merge pull request #280753 from OPNA2608/update/libsidplayfp
libsidplayfp: 2.5.1 -> 2.6.0
This commit is contained in:
commit
090900c7dd
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeFontsConf
|
||||
, nix-update-script
|
||||
, testers
|
||||
@ -19,14 +18,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco=";
|
||||
hash = "sha256-6Gbujz20EHQ7s9GaPpEPju+WqePjpduJqb5hcrswTm8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -35,26 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"doc"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Pull autoconf-2.72 compatibility fix:
|
||||
# https://github.com/libsidplayfp/libsidplayfp/pull/103
|
||||
# Remove when version > 2.5.1
|
||||
(fetchpatch {
|
||||
name = "0001-libsidplayfp-autoconf-2.72-compat.patch";
|
||||
url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch";
|
||||
hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8=";
|
||||
})
|
||||
|
||||
# Fix --disable-tests logic
|
||||
# https://github.com/libsidplayfp/libsidplayfp/pull/108
|
||||
# Remove when version > 2.5.1
|
||||
(fetchpatch {
|
||||
name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch";
|
||||
url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch";
|
||||
hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user