diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cwiid')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/cwiid/default.nix | 39 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/cwiid/fix-ar.diff | 26 |
2 files changed, 56 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cwiid/default.nix b/nixpkgs/pkgs/development/libraries/cwiid/default.nix index e640b6cbbbab..d8c472870c43 100644 --- a/nixpkgs/pkgs/development/libraries/cwiid/default.nix +++ b/nixpkgs/pkgs/development/libraries/cwiid/default.nix @@ -1,13 +1,22 @@ -{ 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"; version = "unstable-2010-02-21"; src = fetchFromGitHub { - owner = "abstrakraft"; - repo = "cwiid"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + owner = "abstrakraft"; + repo = "cwiid"; + rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; }; @@ -19,9 +28,21 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ bison flex bluez gtk2 ]; + patches = [ + ./fix-ar.diff + ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + bluez + gtk2 + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + bison + flex + ]; NIX_LDFLAGS = "-lbluetooth"; @@ -32,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux Nintendo Wiimote interface"; - homepage = "http://cwiid.org"; - license = licenses.gpl2Plus; + homepage = "http://cwiid.org"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/cwiid/fix-ar.diff b/nixpkgs/pkgs/development/libraries/cwiid/fix-ar.diff new file mode 100644 index 000000000000..8ca4b885a0a3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cwiid/fix-ar.diff @@ -0,0 +1,26 @@ +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])], |