diff options
| author | Daniël de Kok <me@danieldk.eu> | 2021-02-11 19:35:54 +0100 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2021-02-12 08:40:46 +0100 |
| commit | 15c32ae8b1cceaead1194ae1bc0b732212955b66 (patch) | |
| tree | 353b4458d60f05029dbb7a9439a41c808bb2054e /pkgs/development/python-modules/adblock | |
| parent | python3Packages.wasmer: switch to buildPythonPackage + cargo hooks (diff) | |
| download | nixpkgs-15c32ae8b1cceaead1194ae1bc0b732212955b66.tar.gz | |
python3Packages.adblock: switch to buildPythonPackage + cargo hooks
Diffstat (limited to 'pkgs/development/python-modules/adblock')
| -rw-r--r-- | pkgs/development/python-modules/adblock/default.nix | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index de6d72a61ecf..c608f48fdf92 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -1,10 +1,9 @@ { stdenv , lib -, rustPlatform , fetchFromGitHub -, pipInstallHook +, buildPythonPackage +, rustPlatform , pythonImportsCheckHook -, maturin , pkg-config , openssl , publicsuffix-list @@ -13,7 +12,7 @@ , Security }: -rustPlatform.buildRustPackage rec { +buildPythonPackage rec { pname = "adblock"; version = "0.4.0"; disabled = isPy27; @@ -25,33 +24,27 @@ rustPlatform.buildRustPackage rec { rev = version; sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg"; }; - format = "pyproject"; - cargoSha256 = "0di05j942rrm2crpdpp9czhh65fmidyrvdp2n3pipgnagy7nchc0"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-gEFmj3/KvhvvsOK2nX2L1RUD4Wfp3nYzEzVnQZIsIDY="; + }; - nativeBuildInputs = [ pipInstallHook maturin pkg-config pythonImportsCheckHook ]; + format = "pyproject"; + + nativeBuildInputs = [ pkg-config pythonImportsCheckHook ] + ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; - buildPhase = '' - runHook preBuild - maturin build --release --manylinux off --strip - runHook postBuild - ''; - # There are no rust tests doCheck = false; - pythonImportsCheck = [ "adblock" ]; - installPhase = '' - runHook preInstall - install -Dm644 -t dist target/wheels/*.whl - pipInstallPhase - runHook postInstall - ''; + pythonImportsCheck = [ "adblock" ]; passthru.meta = with lib; { description = "Python wrapper for Brave's adblocking library, which is written in Rust"; |