From d7b4a0e115bb46309706285e6005a64eae122568 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Jul 2014 14:46:18 +0200 Subject: Move new packages from overrides/ into pkgs/. Those packages aren't actually overrides and thus it doesn't make sense to categorize them into "overrides". Signed-off-by: aszlig --- overrides/fish/default.nix | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 overrides/fish/default.nix (limited to 'overrides/fish/default.nix') diff --git a/overrides/fish/default.nix b/overrides/fish/default.nix deleted file mode 100644 index bc37837b..00000000 --- a/overrides/fish/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, autoconf, ncurses, groff, pythonPackages }: - -stdenv.mkDerivation rec { - name = "fish-${version}"; - version = "2.0.0"; - - buildInputs = [ autoconf ncurses pythonPackages.python ]; - - pythonPath = [ pythonPackages.curses ]; - - enableParallelBuilding = true; - - preConfigure = '' - autoconf - sed -i 's/\/type -P/g' configure - ''; - - postFixup = '' - gen_inserts() { - for i in $pythonPath; do - echo -n "; sys.path.insert(0, '$(toPythonPath "$i")')" - done - } - - find "$out/share/fish/tools" -type f -perm +0100 -name '*.py' | - xargs sed -i -r \ - -e '1 { /^#!/c #!${pythonPackages.python}/bin/python - }' \ - -e '0,/^(from|import)/{/^(from|import)/a import sys'"$(gen_inserts)"' - }' - - sed -i -e "/Popen/s/'manpath'/'man', '-w'/p" \ - "$out/share/fish/tools/create_manpage_completions.py" - - sed -i -e 's|nroff|${groff}/bin/nroff|g' \ - "$out/share/fish/functions/__fish_print_help.fish" - ''; - - src = fetchurl { - url = "http://fishshell.com/files/${version}/fish.tar.gz"; - sha1 = "2d28553e2ff975f8e5fed6b266f7a940493b6636"; - }; -} -- cgit 1.4.1