quickder: cleanup expression

This commit is contained in:
Tobias Mayer 2019-12-20 16:11:05 +01:00
parent dfee92cd2e
commit 5e56f4e19c

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python2Packages, hexio { stdenv, fetchFromGitHub, python2Packages, hexio
, which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: , cmake, bash, arpa2cm, git, asn2quickder }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "quickder"; pname = "quickder";
@ -12,20 +12,17 @@ stdenv.mkDerivation rec {
repo = "quick-der"; repo = "quick-der";
}; };
nativeBuildInputs = [ cmake ];
buildInputs = with python2Packages; [ buildInputs = with python2Packages; [
arpa2cm arpa2cm
asn1ate asn1ate
bash
cmake
git
hexio hexio
pyparsing pyparsing
python python
six six
which
asn1ate asn1ate
asn2quickder asn2quickder
pkgconfig
]; ];
postPatch = '' postPatch = ''
@ -39,9 +36,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DNO_TESTING=ON" "-DNO_TESTING=ON"
"-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/" "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/"
"-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
"-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
"-DPACKAGE_NO_PACKAGE_REGISTRY=ON"
]; ];
preConfigure = '' preConfigure = ''