Commit f36a80e5 authored by Zane van Iperen's avatar Zane van Iperen Committed by Benno Fünfstück
Browse files

cwiid: fix cross-compilation 

* Remove hardcoded use of ar.
* Move flex and bison to nativeBuildInputs.
* Reformat for good measure.
parent e1107739

pkgs/development/libraries/cwiid/default.nix

+30 −9
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:

{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

, bison

, flex

, bluez

, pkg-config

, gtk2

}:



stdenv.mkDerivation rec {

  pname = "cwiid";
@@ -19,9 +28,21 @@ stdenv.mkDerivation rec { 
    sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in

  '';



  buildInputs = [ bison flex bluez gtk2 ];



  nativeBuildInputs = [ autoreconfHook pkg-config ];

  patches = [

    ./fix-ar.diff

  ];



  buildInputs = [

    bluez

    gtk2

  ];



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

    bison

    flex

  ];



  NIX_LDFLAGS = "-lbluetooth";

pkgs/development/libraries/cwiid/fix-ar.diff

0 → 100644
+26 −0
Original line number Diff line number Diff line 
diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in

index 3afbb14..b8df9d9 100644

--- a/common/include/lib.mak.in

+++ b/common/include/lib.mak.in

@@ -22,7 +22,7 @@ static: $(STATIC_LIB)

 shared: $(SHARED_LIB)

 

 $(STATIC_LIB): $(OBJECTS)

-	ar rcs $(STATIC_LIB) $(OBJECTS)

+	$(AR) rcs $(STATIC_LIB) $(OBJECTS)

 

 $(SHARED_LIB): $(OBJECTS)

 	$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \

diff --git a/configure.ac b/configure.ac

index 82ca3e1..0a78283 100644

--- a/configure.ac

+++ b/configure.ac

@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then

 	AC_MSG_ERROR([bison not found])

 fi

 

+AC_CHECK_TOOL([AR], [ar], [:])

+

 AC_ARG_WITH(

 	[python],

 	[AS_HELP_STRING([--without-python],[compile without python support])],