mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
brltty: 5.4 -> 5.5
This commit is contained in:
parent
5e2de6d846
commit
dac2a7693a
@ -4,14 +4,12 @@ assert alsaSupport -> alsaLib != null;
|
||||
assert systemdSupport -> systemd != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "brltty-5.4";
|
||||
name = "brltty-5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://brltty.com/archive/${name}.tar.gz";
|
||||
sha256 = "1993brxa76yf7z3ckax0bbmqv6jp8vjwxp19h425v4gpm0m17k7l";
|
||||
sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci";
|
||||
};
|
||||
|
||||
patches = [ ./systemd.patch ];
|
||||
|
||||
buildInputs = [ pkgconfig bluez ]
|
||||
++ stdenv.lib.optional alsaSupport alsaLib
|
||||
|
@ -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@
|
Loading…
Reference in New Issue
Block a user