public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46578 from costrouc/costrouc/xnd-linker

Browse Source 
libxnd, libndtypes: refactor add support for darwin
This commit is contained in:
John Ericson 2018-09-13 15:37:12 -04:00 committed by GitHub
commit 59be6689fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libndtypes/default.nix
View File

@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli"; sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli";
}; };
makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ]; # Override linker with cc (symlink to either gcc or clang)
# Library expects to use cc for linking
configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
meta = { meta = {
description = "Dynamic types for data description and in-memory computations"; description = "Dynamic types for data description and in-memory computations";
@ -22,4 +24,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.bsdOriginal; license = lib.licenses.bsdOriginal;
maintainers = with lib.maintainers; [ costrouc ]; maintainers = with lib.maintainers; [ costrouc ];
}; };
} }

7
pkgs/development/libraries/libxnd/default.nix
View File

@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
buildInputs = [ libndtypes ]; buildInputs = [ libndtypes ];
configureFlags = [ "XND_INCLUDE='-I${libndtypes}/include'" # Override linker with cc (symlink to either gcc or clang)
"XND_LINK='-L${libndtypes}/lib'" ]; # Library expects to use cc for linking
configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ];
meta = { meta = {
description = "General container that maps a wide range of Python values directly to memory"; description = "General container that maps a wide range of Python values directly to memory";