From d7ad284e912c00bbeda2c1905884d4d6780baa2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 1 Mar 2019 16:43:03 +0100 Subject: [PATCH] Add some small patches to unclutter the home directory and missing notmuch plugins --- default.nix | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 8b2aaaa..49013b9 100644 --- a/default.nix +++ b/default.nix @@ -88,7 +88,7 @@ let }; }; - mypkgs.terminal_velocity = with python2Packages; buildPythonApplication rec { + mypkgs.terminal-velocity = with python2Packages; buildPythonApplication rec { pname = "terminal-velocity-git"; version = "0.2.0"; @@ -101,6 +101,9 @@ let propagatedBuildInputs = [ chardet urwid nixpkgs_unstable.python2Packages.sh pyyaml ]; buildInputs = [ m2r restructuredtext_lint pygments ]; + postInstall = '' + rm $out/bin/terminal_velocity + ''; src = fetchPypi { inherit pname version; sha256 = "13yrkcmvh5h5fwnai61sbmqkrjyisz08n62pq0ada2lyyqf7g6b9"; @@ -301,6 +304,7 @@ let done sed -i "$out/bin/muttprint" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|" + sed -i "$out/bin/muttprint" -e "s|ENV{HOME}/.muttprintrc|ENV{XDG_CONFIG_HOME}/muttprint/muttprintrc|" wrapProgram $out/bin/muttprint \ --prefix PATH : ${lib.makeBinPath [ psutils dialog @@ -311,6 +315,58 @@ let }; mypkgs.yarn2nix = yarn2nixPackage.yarn2nix; + + mypkgs.sc-im = sc-im.overrideAttrs (old: { + buildPhase = '' + cd src + sed -i Makefile -e 's@\...name.info@.local/state/$(name)info@' + cd .. + '' + old.buildPhase; + }); + + mypkgs.notmuch-vim = stdenv.mkDerivation rec { + name = "notmuch-vim-${version}"; + version = nixpkgs_unstable.notmuch.version; + outputs = [ "out" ]; + src = nixpkgs_unstable.notmuch.src; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + make -C vim DESTDIR=$out prefix="/share/vim/vimfiles" install + ''; + }; + + mypkgs.notmuch-python2 = stdenv.mkDerivation rec { + name = "notmuch-python2-${version}"; + version = nixpkgs_unstable.notmuch.version; + outputs = [ "out" ]; + buildInputs = [ python2Packages.sphinx python2Packages.python ]; + src = nixpkgs_unstable.notmuch.src; + phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; + buildPhase = '' + cd bindings/python + python setup.py build + ''; + installPhase = '' + python setup.py install --prefix=$out --optimize=1 + ''; + }; + + mypkgs.notmuch-python3 = stdenv.mkDerivation rec { + name = "notmuch-python3-${version}"; + version = nixpkgs_unstable.notmuch.version; + outputs = [ "out" ]; + buildInputs = [ nixpkgs_unstable.python3Packages.sphinx nixpkgs_unstable.python3Packages.python ]; + src = nixpkgs_unstable.notmuch.src; + phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; + buildPhase = '' + cd bindings/python + python setup.py build + ''; + installPhase = '' + python setup.py install --prefix=$out --optimize=1 + ''; + }; + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks in @@ -318,7 +374,6 @@ in inherit nix-prefetch-scripts; inherit nix-generate-from-cpan; inherit timewarrior; - inherit sc-im; inherit pal; inherit pdftk; inherit googler; @@ -371,7 +426,7 @@ in inherit valgrind; inherit ranger; inherit strace; - inherit notmuch; + inherit notmuch notmuch-mutt; stgit = gitAndTools.stgit; inherit bundix; bower2nix = nodePackages.bower2nix; -- 2.41.0