public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36789 from badi/darwin-fixes-libtar

Browse Source 
libtar, languagemachines: fix darwin build
This commit is contained in:
Daiderd Jordan 2018-03-11 15:10:12 +01:00 committed by GitHub
commit 4443c5f740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/languagemachines/frog.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive , automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
, libxml2, icu , libxml2, icu
, languageMachines , languageMachines
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "frog-${release.version}.tar.gz"; }; name = "frog-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2 icu libxml2 icu
languageMachines.ticcutils languageMachines.ticcutils
languageMachines.timbl languageMachines.timbl

4
pkgs/development/libraries/languagemachines/libfolia.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive , automake, autoconf, libtool, pkgconfig, autoconf-archive
, libxml2, icu , libxml2, icu, bzip2, libtar
, languageMachines }: , languageMachines }:
let let
@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "libfolia-${release.version}.tar.gz"; }; name = "libfolia-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ]; 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"; preConfigure = "sh bootstrap.sh";
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/languagemachines/mbt.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive , automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
, libxml2 , libxml2
, languageMachines , languageMachines
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "mbt-${release.version}.tar.gz"; }; name = "mbt-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2 libxml2
languageMachines.ticcutils languageMachines.ticcutils
languageMachines.timbl languageMachines.timbl

4
pkgs/development/libraries/languagemachines/timbl.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive , automake, autoconf, libtool, pkgconfig, autoconf-archive
, libxml2 , libxml2, bzip2, libtar
, languageMachines , languageMachines
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "timbl-${release.version}.tar.gz"; }; name = "timbl-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2 libxml2
languageMachines.ticcutils languageMachines.ticcutils
]; ];

4
pkgs/development/libraries/languagemachines/timblserver.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive , automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
, libxml2 , libxml2
, languageMachines , languageMachines
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "timblserver-${release.version}.tar.gz"; }; name = "timblserver-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
libxml2 libxml2
languageMachines.ticcutils languageMachines.ticcutils
languageMachines.timbl languageMachines.timbl

6
pkgs/development/libraries/languagemachines/ucto.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, automake, autoconf, libtool, pkgconfig, autoconf-archive , automake, autoconf, libtool, pkgconfig, autoconf-archive
, libxml2, icu , libxml2, icu, bzip2, libtar
, languageMachines , languageMachines
}: }:
@ -14,8 +14,8 @@ stdenv.mkDerivation {
src = fetchurl { inherit (release) url sha256; src = fetchurl { inherit (release) url sha256;
name = "ucto-${release.version}.tar.gz"; }; name = "ucto-${release.version}.tar.gz"; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ automake autoconf libtool autoconf-archive buildInputs = [ automake autoconf bzip2 libtool autoconf-archive
icu libxml2 icu libtar libxml2
languageMachines.ticcutils languageMachines.ticcutils
languageMachines.libfolia languageMachines.libfolia
languageMachines.uctodata languageMachines.uctodata

2
pkgs/development/libraries/libtar/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "C library for manipulating POSIX tar files"; description = "C library for manipulating POSIX tar files";
homepage = http://www.feep.net/libtar/; homepage = http://www.feep.net/libtar/;
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
}; };
} }