diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
| commit | cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d (patch) | |
| tree | e72cb717dfc1161f4a6a2218cc11dc6a07bdec05 /pkgs/applications/editors | |
| parent | 09e2990117c2eb0f9ab054ecf65cda7d55ca0dfc (diff) | |
| parent | 27955d37e97b5a35c83222345f057b322334c7ac (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/manuskript/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 2dd9174d6dd1..cc39da90c237 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { --replace sample-projects $out/share/${pname}/sample-projects ''; - buildPhase = ''''; + buildPhase = ""; installPhase = '' mkdir -p $out/share/${pname} diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 97e8378d94e8..00d0259a7a9b 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -122,7 +122,7 @@ mkDerivation rec { mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; }; - qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ]; + qtWrapperArgs = [ "--suffix PATH : ${gnumake}/bin" ]; postInstall = '' mkdir $out/share diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e611e486288f..734b189d1e48 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -137,8 +137,7 @@ in stdenv.mkDerivation rec { ++ lib.optional tclSupport tcl ++ lib.optional rubySupport ruby; - preConfigure = '' - '' + lib.optionalString ftNixSupport '' + preConfigure = "" + lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim |