diff options
author | Will Dietz <github@wdtz.org> | 2018-05-16 16:24:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 16:24:19 -0500 |
commit | 1291111674ea2cea105187fdc14481cd0d4b2775 (patch) | |
tree | 07c31f1d1d6c234650e1cf3f31c4e29a543b3964 /pkgs | |
parent | f3fcf1b0a9b0398620b5fa9b40268ef651aa373e (diff) | |
parent | c8996506e136cc8cbe4131d2514b801ddca1a3b1 (diff) | |
download | nixpkgs-1291111674ea2cea105187fdc14481cd0d4b2775.tar nixpkgs-1291111674ea2cea105187fdc14481cd0d4b2775.tar.gz nixpkgs-1291111674ea2cea105187fdc14481cd0d4b2775.tar.bz2 nixpkgs-1291111674ea2cea105187fdc14481cd0d4b2775.tar.lz nixpkgs-1291111674ea2cea105187fdc14481cd0d4b2775.tar.xz nixpkgs-1291111674ea2cea105187fdc14481cd0d4b2775.tar.zst nixpkgs-1291111674ea2cea105187fdc14481cd0d4b2775.zip |
Merge pull request #40615 from dtzWill/fix/dyncall-touchup
dyncall: install cmake modules, man pages, use upstream's preferred URL
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/dyncall/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index b60f61299f3..704f5c51c9c 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -10,12 +10,26 @@ stdenv.mkDerivation rec { sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2"; }; - doCheck = true; - checkTarget = "run-tests"; + # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) + doCheck = false; + + # install bits not automatically installed + postInstall = '' + # install cmake modules to make using dyncall easier + # This is essentially what -DINSTALL_CMAKE_MODULES=ON if using cmake build + # We don't use the cmake-based build since it installs different set of headers + # (mostly fewer headers, but installs dyncall_alloc_wx.h "instead" dyncall_alloc.h) + # and we'd have to patch the cmake module installation to not use CMAKE_ROOT anyway :). + install -D -t $out/lib/cmake ./buildsys/cmake/Modules/Find*.cmake + + # manpages are nice, install them + # doing this is in the project's "ToDo", so check this when updating! + install -D -t $out/share/man/man3 ./*/*.3 + ''; meta = with stdenv.lib; { description = "Highly dynamic multi-platform foreign function call interface library"; - homepage = http://dyncall.org; + homepage = http://www.dyncall.org; license = licenses.isc; maintainers = with maintainers; [ dtzWill ]; }; |