diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-07-16 19:53:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-19 20:30:42 +0000 |
| commit | 8c05e036ea485166c474f39d46e6f4441baeda0e (patch) | |
| tree | 554299bdea87a5cecd69112a306bb305cc12db3f /pkgs/applications/version-management/git-and-tools | |
| parent | 8deb97c2108bdd970d8b44ab276d33c9345d36c1 (diff) | |
| download | nixpkgs-8c05e036ea485166c474f39d46e6f4441baeda0e.tar nixpkgs-8c05e036ea485166c474f39d46e6f4441baeda0e.tar.gz nixpkgs-8c05e036ea485166c474f39d46e6f4441baeda0e.tar.bz2 nixpkgs-8c05e036ea485166c474f39d46e6f4441baeda0e.tar.lz nixpkgs-8c05e036ea485166c474f39d46e6f4441baeda0e.tar.xz nixpkgs-8c05e036ea485166c474f39d46e6f4441baeda0e.tar.zst nixpkgs-8c05e036ea485166c474f39d46e6f4441baeda0e.zip | |
gitAndTools.git-remote-hg: use buildPythonApplication
This is much cleaner than constructing PYTHONPATH using interpolated subshells.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 58d9bf80fb3..dd4e6e011a6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, mercurial, makeWrapper +{ stdenv, lib, fetchFromGitHub, python3Packages , asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "git-remote-hg"; version = "unstable-2020-06-12"; @@ -13,17 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0dw48vbnk7pp0w6fzgl29mq8fyn52pacbya2w14z9c6jfvh5sha1"; }; - buildInputs = [ mercurial.python mercurial makeWrapper + nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2 ]; - - doCheck = false; - - installFlags = [ "HOME=\${out}" "install-doc" ]; + propagatedBuildInputs = with python3Packages; [ mercurial ]; postInstall = '' - wrapProgram $out/bin/git-remote-hg \ - --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" + make install-doc prefix=$out ''; meta = with lib; { |