diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 4079f6278235..2a0601a8875e 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -1,12 +1,12 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, autoreconfHook -, pkg-config -, pcsclite -, PCSC -, xcbuild +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + autoreconfHook, + pkg-config, + pcsclite, + PCSC, }: stdenv.mkDerivation rec { @@ -26,26 +26,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - buildInputs = if stdenv.hostPlatform.isDarwin then [ PCSC ] else [ pcsclite ]; - - patches = let - url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; - in [ - (fetchpatch { - name = "make-cli-pipes-work-1.patch"; - url = url "0425184dbf3fdaf59854af5f530da88b2196a57b"; - sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd"; - }) - (fetchpatch { - name = "make-cli-pipes-work-2.patch"; - url = url "cebabeab2bda065dca1c9f033b42d391be866d86"; - sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28"; - }) ]; - buildFlags = - lib.optional stdenv.hostPlatform.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; + buildInputs = + lib.optionals stdenv.hostPlatform.isDarwin [ PCSC ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-deprecated-non-prototype"; + + patches = + let + url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; + in + [ + (fetchpatch { + name = "make-cli-pipes-work-1.patch"; + url = url "0425184dbf3fdaf59854af5f530da88b2196a57b"; + sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd"; + }) + (fetchpatch { + name = "make-cli-pipes-work-2.patch"; + url = url "cebabeab2bda065dca1c9f033b42d391be866d86"; + sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28"; + }) + ]; meta = with lib; { description = "Sample implementation of the ARIB STD-B25 standard";