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

Merge pull request from bramd/fix/brltty-5.5

Browse Source 
brltty: 5.4 -> 5.5
This commit is contained in:
Jörg Thalheim 2017-06-26 10:01:30 +01:00 committed by GitHub
commit ff04c361cf
2 changed files with 2 additions and 26 deletions
pkgs/tools/misc/brltty
default.nixsystemd.patch

6
pkgs/tools/misc/brltty/default.nix
View File

@ -4,15 +4,13 @@ assert alsaSupport -> alsaLib != null;
assert systemdSupport -> systemd != null; assert systemdSupport -> systemd != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "brltty-5.4"; name = "brltty-5.5";
src = fetchurl { src = fetchurl {
url = "http://brltty.com/archive/${name}.tar.gz"; url = "http://brltty.com/archive/${name}.tar.gz";
sha256 = "1993brxa76yf7z3ckax0bbmqv6jp8vjwxp19h425v4gpm0m17k7l"; sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci";
}; };
patches = [ ./systemd.patch ];
buildInputs = [ pkgconfig bluez ] buildInputs = [ pkgconfig bluez ]
++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional alsaSupport alsaLib
++ stdenv.lib.optional systemdSupport systemd; ++ stdenv.lib.optional systemdSupport systemd;

22
pkgs/tools/misc/brltty/systemd.patch
View File

@ -1,22 +0,0 @@
diff --git a/config.mk.in b/config.mk.in
index 5093b9c..b707bd4 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $
ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O
BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS)
OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS)
-PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
+PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
CC = @CC@
CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@
@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
+LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) $(SERVICE_LIBS) @LIBS@
MKOBJ = @MKOBJ@
MKMOD = @MKMOD@