Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libtar, languagemachines: fix darwin build #36789

Merged
merged 2 commits into from
Mar 11, 2018
Merged

libtar, languagemachines: fix darwin build #36789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3117ae6
libtar: add darwin to supported platforms
badmutex Mar 11, 2018
ff0f112
languagemachines: fix darwin build
badmutex Mar 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/languagemachines/frog.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive
, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
, libxml2, icu
, languageMachines
}:
Expand All @@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256;
name = "frog-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive
buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2 icu
languageMachines.ticcutils
languageMachines.timbl
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/languagemachines/libfolia.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive
, libxml2, icu
, libxml2, icu, bzip2, libtar
, languageMachines }:

let
Expand All @@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256;
name = "libfolia-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils ];
buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
preConfigure = "sh bootstrap.sh";

meta = with stdenv.lib; {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/languagemachines/mbt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive
, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
, libxml2
, languageMachines
}:
Expand All @@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256;
name = "mbt-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive
buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2
languageMachines.ticcutils
languageMachines.timbl
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/languagemachines/timbl.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive
, libxml2
, libxml2, bzip2, libtar
, languageMachines
}:

Expand All @@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256;
name = "timbl-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive
buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2
languageMachines.ticcutils
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/languagemachines/timblserver.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive
, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
, libxml2
, languageMachines
}:
Expand All @@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256;
name = "timblserver-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive
buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2
languageMachines.ticcutils
languageMachines.timbl
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/languagemachines/ucto.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive
, libxml2, icu
, libxml2, icu, bzip2, libtar
, languageMachines
}:

Expand All @@ -14,8 +14,8 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256;
name = "ucto-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive
icu libxml2
buildInputs = [ automake autoconf bzip2 libtool autoconf-archive
icu libtar libxml2
languageMachines.ticcutils
languageMachines.libfolia
languageMachines.uctodata
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libtar/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "C library for manipulating POSIX tar files";
homepage = http://www.feep.net/libtar/;
license = licenses.bsd3;
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ];
};
}