From b0fa0bf13cdf11c0a4cf0603d7a2cbdab6f6ae55 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 5 Apr 2019 17:07:54 +0200 Subject: [PATCH] vdirsyncer: cleanup See https://github.com/NixOS/nixpkgs/pull/59010 --- pkgs/tools/misc/vdirsyncer/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index af8d0862d1bb..cd4297103ec8 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, glibcLocales, rustPlatform, pkgconfig, openssl, Security }: +{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, Security }: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst @@ -32,9 +32,9 @@ python3Packages.buildPythonApplication rec { shippai ]; - buildInputs = with python3Packages; [ setuptools_scm ]; + nativeBuildInputs = with python3Packages; [ setuptools_scm ]; - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ]; + checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; patches = [ # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 @@ -66,8 +66,6 @@ python3Packages.buildPythonApplication rec { ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ ''; - LC_ALL = "en_US.utf8"; - checkPhase = '' rm -rf vdirsyncer export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH @@ -78,7 +76,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = platforms.all; license = licenses.mit; }; }