Merge pull request #113188 from OPNA2608/fix/bambootracker-marked-broken/21.03

bambootracker: un-mark broken on darwin
This commit is contained in:
Sandro 2021-02-16 21:59:35 +01:00 committed by GitHub
commit 70895f1c60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
{ mkDerivation { mkDerivation
, lib , lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, qmake , qmake
, pkg-config , pkg-config
, qttools , qttools
@ -21,10 +21,15 @@ mkDerivation rec {
sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc";
}; };
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # TODO Remove when updating past 0.4.6
substituteInPlace BambooTracker/BambooTracker.pro \ # Fixes build failure on darwin
--replace '# Temporary known-error downgrades here' 'CPP_WARNING_FLAGS += -Wno-missing-braces' patches = [
''; (fetchpatch {
name = "bambootracker-Add_braces_in_initialization_of_std-array.patch";
url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch";
sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn";
})
];
nativeBuildInputs = [ qmake qttools pkg-config ]; nativeBuildInputs = [ qmake qttools pkg-config ];
@ -40,6 +45,5 @@ mkDerivation rec {
license = licenses.gpl2Only; license = licenses.gpl2Only;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ]; maintainers = with maintainers; [ OPNA2608 ];
broken = stdenv.isDarwin;
}; };
} }