diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 18:03:42 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:54 -0400 |
| commit | f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 (patch) | |
| tree | e853e7da55b09acd1d622991491c1a696f9857ef /pkgs/development/libraries/fflas-ffpack | |
| parent | 531e4b80c97002a542beb8fe356177ebd66cdd8e (diff) | |
| download | nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.gz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.bz2 nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.lz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.xz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.zst nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.zip | |
misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed.
Diffstat (limited to 'pkgs/development/libraries/fflas-ffpack')
| -rw-r--r-- | pkgs/development/libraries/fflas-ffpack/1.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/fflas-ffpack/default.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index c723885a68b..5efa378ff5f 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -7,9 +7,8 @@ stdenv.mkDerivation rec { url = "http://linalg.org/fflas-ffpack-${version}.tar.gz"; sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro_3_7 openblas gmpxx]; - nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; meta = { inherit version; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index f1d6e47f56e..0e4e897e27a 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; - nativeBuildInputs = [pkgconfig]; configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; meta = { inherit version; |