movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge pull request #204327 from wegank/antlr2-python

Browse source
This commit is contained in:
Sandro 2022-12-04 02:26:58 +01:00 • committed by GitHub
commit 8e9ef715fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/nco/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: { lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils, libtool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nco"; pname = "nco";
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
--replace "/bin/mv" "${coreutils}/bin/mv" --replace "/bin/mv" "${coreutils}/bin/mv"
''; '';
makeFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
@ -30,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "http://nco.sourceforge.net/"; homepage = "http://nco.sourceforge.net/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ bzizou ]; maintainers = with maintainers; [ bzizou ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

4
pkgs/development/libraries/netcdf-cxx4/default.nix
View file

@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
buildInputs = [ netcdf hdf5 curl ]; buildInputs = [ netcdf hdf5 curl ];
doCheck = true; # 10 - cxx4_test_filter (Failed)
# Setting Filter....Caught unexpected exception.
doCheck = false;
enableParallelChecking = false; enableParallelChecking = false;
meta = { meta = {

3
pkgs/development/tools/parsing/antlr/2.7.7.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, jdk, python2 }: { lib, stdenv, fetchurl, jdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "antlr"; pname = "antlr";
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
}; };
patches = [ ./2.7.7-fixes.patch ]; patches = [ ./2.7.7-fixes.patch ];
buildInputs = [ jdk ]; buildInputs = [ jdk ];
nativeBuildInputs = [ python2 ];
meta = with lib; { meta = with lib; {
description = "Powerful parser generator"; description = "Powerful parser generator";