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

sage: re-add pkg-config aliases

Browse Source 
Those were removed because they were added to openblas itself. There was
an error with that however and it will take some time until the fix
makes its way through staging. For the time being, reverting this part
of 26d5d030fe will fix the sage build.
This commit should be reverted once
408eacbc89 is in master.
This commit is contained in:
Timo Kaufmann
2018-09-07 21:55:41 +02:00
parent b11cfc2622
commit db784d883c
5 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/math/sage/default.nix
+7 -3
View File
@@ -21,7 +21,7 @@ let
sagelib = self.callPackage ./sagelib.nix {
inherit flint ecl arb;
inherit sage-src pynac singular;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
linbox = nixpkgs.linbox.override { withSage = true; };
};
@@ -41,13 +41,13 @@ let
};
sage-env = self.callPackage ./sage-env.nix {
inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv;
inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
sage-with-env = self.callPackage ./sage-with-env.nix {
inherit pythonEnv;
inherit sage-src pynac singular;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages_8_x.three;
};
@@ -60,6 +60,10 @@ let
};
};
openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
sage-src = callPackage ./sage-src.nix {};
pythonRuntimeDeps = with python.pkgs; [