diff options
| author | Jakob Gillich <jakob@gillich.me> | 2016-01-05 18:00:34 +0100 |
|---|---|---|
| committer | Jakob Gillich <jakob@gillich.me> | 2016-01-05 23:32:29 +0100 |
| commit | 5e5ecb7b6f476af51dcad4ac05b556a3860cad6f (patch) | |
| tree | e46d8f572603b21a6956b7e9c132c68b4b41e6b9 /pkgs/shells/fish | |
| parent | 60598311480a0f21599faed31c87fd7e75adbaaa (diff) | |
| download | nixpkgs-5e5ecb7b6f476af51dcad4ac05b556a3860cad6f.tar nixpkgs-5e5ecb7b6f476af51dcad4ac05b556a3860cad6f.tar.gz nixpkgs-5e5ecb7b6f476af51dcad4ac05b556a3860cad6f.tar.bz2 nixpkgs-5e5ecb7b6f476af51dcad4ac05b556a3860cad6f.tar.lz nixpkgs-5e5ecb7b6f476af51dcad4ac05b556a3860cad6f.tar.xz nixpkgs-5e5ecb7b6f476af51dcad4ac05b556a3860cad6f.tar.zst nixpkgs-5e5ecb7b6f476af51dcad4ac05b556a3860cad6f.zip | |
fish: fix merge conflict
patches got duplicated
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0fa8e82fb89..1419b180d72 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -5,16 +5,13 @@ stdenv.mkDerivation rec { name = "fish-${version}"; version = "2.2.0"; - patches = [ ./command-not-found.patch ]; + patches = [ ./etc_config.patch ./builtin_status.patch ./command-not-found.patch ]; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7"; }; - # builtin_status has been upstreamed https://github.com/fish-shell/fish-shell/pull/2636 - patches = [ ./etc_config.patch ./builtin_status.patch ]; - buildInputs = [ ncurses libiconv ]; # Required binaries during execution |