diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/boxfort | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/boxfort')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/boxfort/default.nix | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/nixpkgs/pkgs/development/libraries/boxfort/default.nix index fb6e735c46e7..9a4e2c233561 100644 --- a/nixpkgs/pkgs/development/libraries/boxfort/default.nix +++ b/nixpkgs/pkgs/development/libraries/boxfort/default.nix @@ -1,36 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libcsptr, dyncall -, nanomsg, python37Packages }: +{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }: stdenv.mkDerivation rec { - version = "unstable-2019-09-19"; + version = "unstable-2019-10-09"; pname = "boxfort"; src = fetchFromGitHub { owner = "Snaipe"; repo = "BoxFort"; - rev = "926bd4ce968592dbbba97ec1bb9aeca3edf29b0d"; - sha256 = "0mzy4f8qij6ckn5578y3l4rni2470pdkjy5xww7ak99l1kh3p3v6"; + rev = "356f047db08b7344ea7980576b705e65b9fc8772"; + sha256 = "1p0llz7n0p5gzpvqszmra9p88vnr0j88sp5ixhgbfz89bswg62ss"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ meson ninja ]; - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - dyncall - gettext - libcsptr - nanomsg - ]; + preConfigure = '' + patchShebangs ci/isdir.py + ''; checkInputs = with python37Packages; [ cram ]; - cmakeFlags = [ "-DBXF_FORK_RESILIENCE=OFF" ]; - doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; outputs = [ "dev" "out" ]; @@ -38,10 +27,7 @@ stdenv.mkDerivation rec { description = "Convenient & cross-platform sandboxing C library"; homepage = "https://github.com/Snaipe/BoxFort"; license = licenses.mit; - maintainers = with maintainers; [ - thesola10 - Yumasi - ]; + maintainers = with maintainers; [ thesola10 Yumasi ]; platforms = platforms.unix; }; } |