diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-20 09:21:51 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-20 09:21:51 +0000 |
| commit | ab0d141f44715d83a1527829473fe9e5c3b6e5db (patch) | |
| tree | fa2ac4c6ab37fc178cb7d3248846c91a6e690b3a /pkgs/tools/text | |
| parent | eb3d20761169696f78bfd40afb92ab099c7507a3 (diff) | |
| parent | 36e67d2beb9d34fb0198999f08630094d7398d9e (diff) | |
| download | nixlib-ab0d141f44715d83a1527829473fe9e5c3b6e5db.tar nixlib-ab0d141f44715d83a1527829473fe9e5c3b6e5db.tar.gz nixlib-ab0d141f44715d83a1527829473fe9e5c3b6e5db.tar.bz2 nixlib-ab0d141f44715d83a1527829473fe9e5c3b6e5db.tar.lz nixlib-ab0d141f44715d83a1527829473fe9e5c3b6e5db.tar.xz nixlib-ab0d141f44715d83a1527829473fe9e5c3b6e5db.tar.zst nixlib-ab0d141f44715d83a1527829473fe9e5c3b6e5db.zip | |
Merge branch 'master' into staging
* master: (23 commits) silver-searcher: patch bash completions location shairplay: init at 2016-01-01 ocamlPackages.rope: 0.5 -> 0.6 ocamlPackages.ocaml_gettext: 0.8.7 -> 0.8.8 mupdf: Patch openjpeg version nextcloud-client: fix build after qt updates gstreamer.gst-plugins-bad: Patch openjpeg version silver-searcher: move bash completion to etc/bash-completion.d/ neomutt: use mime.types from dedicated mime-types derivation mime_types: rename to mime-types XMLLibXML: 2.0129 -> 2.0132 fixes failing tests & CVE-2017-10672 nixos/matrix-synapse: remove unused log_file config nixos: run parted with --script option (3rd) nixos: run parted with --script option (2nd) nixos/release: add nixos/tests/switch-test.nix to tested job nixos/system: make switch-to-configuration script pure. nixos/release: include mutableUsers test to release tests. nixos/tests: Add a test for config.users.mutableUsers. corebird: 1.7.2 -> 1.7.3 nixos/matrix-synapse: make home directory configurable ...
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/silver-searcher/bash-completion.patch | 5 | ||||
| -rw-r--r-- | pkgs/tools/text/silver-searcher/default.nix | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/text/silver-searcher/bash-completion.patch b/pkgs/tools/text/silver-searcher/bash-completion.patch new file mode 100644 index 000000000000..30e8c72389b7 --- /dev/null +++ b/pkgs/tools/text/silver-searcher/bash-completion.patch @@ -0,0 +1,5 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -9 +9 @@ +-bashcompdir = $(pkgdatadir)/completions ++bashcompdir = $(datadir)/bash-completion/completions diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 156a8bd8f646..fe890c2916d0 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0wcw4kyivb10m9b173183jrj46a0gisd35yqxi1mr9hw5l5dhkpa"; }; + patches = [ ./bash-completion.patch ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; |