mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 23:20:55 +00:00
Merge pull request #6528 from codyopel/stdenv-fixes
remove stdenv.isBSD
This commit is contained in:
William A. Kennington III
commit
adbba6eded
|
|
@ -5,7 +5,7 @@ let
|
|||
platform = with stdenv;
|
||||
if isDarwin then "macosx"
|
||||
else if isCygwin then "cygwin"
|
||||
else if isBSD then "bsd"
|
||||
else if (isFreeBSD || isOpenBSD) then "bsd"
|
||||
else if isSunOS then "solaris"
|
||||
else "linux"; # Should be a sane default
|
||||
lib = stdenv.lib;
|
||||
|
|
|
|||
|
|
@ -21,14 +21,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
|
||||
|
||||
postInstall =
|
||||
# Install headers in the right place.
|
||||
'' ln -s${if stdenv.isBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include"
|
||||
postInstall = ''
|
||||
ln -s${if (stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) then "" else "r"}v "$out/lib/"libffi*/include "$out/include"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A foreign function call interface library";
|
||||
|
||||
longDescription = ''
|
||||
The libffi library provides a portable, high level programming
|
||||
interface to various calling conventions. This allows a
|
||||
|
|
@ -43,12 +42,9 @@ stdenv.mkDerivation rec {
|
|||
interface. A layer must exist above libffi that handles type
|
||||
conversions for values passed between the two languages.
|
||||
'';
|
||||
|
||||
homepage = http://sourceware.org/libffi/;
|
||||
|
||||
# See http://github.com/atgreen/libffi/blob/master/LICENSE .
|
||||
license = stdenv.lib.licenses.free;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -203,11 +203,6 @@ let
|
|||
|| system == "x86_64-freebsd";
|
||||
isOpenBSD = system == "i686-openbsd"
|
||||
|| system == "x86_64-openbsd";
|
||||
isBSD = system == "i686-freebsd"
|
||||
|| system == "x86_64-freebsd"
|
||||
|| system == "i686-openbsd"
|
||||
|| system == "x86_64-openbsd"
|
||||
|| system == "x86_64-darwin";
|
||||
isi686 = system == "i686-linux"
|
||||
|| system == "i686-gnu"
|
||||
|| system == "i686-freebsd"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
''
|
||||
# Fix for building on Glibc 2.16. Won't be needed once the
|
||||
# gnulib in sharutils is updated.
|
||||
sed -i ${stdenv.lib.optionalString (stdenv.isBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
|
||||
sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
|
||||
'';
|
||||
|
||||
# GNU Gettext is needed on non-GNU platforms.
|
||||
|
|
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Tools for remote synchronization and `shell archives'";
|
||||
|
||||
longDescription =
|
||||
'' GNU shar makes so-called shell archives out of many files, preparing
|
||||
them for transmission by electronic mail services. A shell archive
|
||||
|
|
@ -43,11 +42,8 @@ stdenv.mkDerivation rec {
|
|||
by a copy of the shell. unshar may also process files containing
|
||||
concatenated shell archives.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/sharutils/;
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
buildInputs = [
|
||||
unzip
|
||||
];
|
||||
isUnix = stdenv.isLinux || stdenv.isGNU || stdenv.isDarwin || stdenv.isBSD;
|
||||
isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
|
||||
isx86 = stdenv.isi686 || stdenv.isx86_64;
|
||||
compileFlags = ""
|
||||
+ (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
buildInputs = [
|
||||
unzip
|
||||
];
|
||||
isUnix = stdenv.isLinux || stdenv.isGNU || stdenv.isDarwin || stdenv.isBSD;
|
||||
isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
|
||||
isx86 = stdenv.isi686 || stdenv.isx86_64;
|
||||
compileFlags = ""
|
||||
+ (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@ let
|
|||
# These settings are found in the Makefile, but there seems to be no
|
||||
# way to select one ore the other setting other than editing the file
|
||||
# manually, so we have to duplicate the know how here.
|
||||
systemFlags =
|
||||
if stdenv.isDarwin then ''
|
||||
systemFlags = with stdenv;
|
||||
if isDarwin then ''
|
||||
CFLAGS="-O2 -Wall -fomit-frame-pointer"
|
||||
LDFLAGS=
|
||||
EXTRA_OBJS=strverscmp.o
|
||||
'' else if stdenv.isCygwin then ''
|
||||
'' else if isCygwin then ''
|
||||
CFLAGS="-O2 -Wall -fomit-frame-pointer -DCYGWIN"
|
||||
LDFLAGS=-s
|
||||
TREE_DEST=tree.exe
|
||||
EXTRA_OBJS=strverscmp.o
|
||||
'' else if stdenv.isBSD then ''
|
||||
'' else if (isFreeBSD || isOpenBSD) then ''
|
||||
CFLAGS="-O2 -Wall -fomit-frame-pointer"
|
||||
LDFLAGS=-s
|
||||
EXTRA_OBJS=strverscmp.o
|
||||
|
|
|
|||
Loading…
Reference in a new issue