diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-09-05 18:10:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 18:10:32 -0400 |
| commit | 40e917d35d0c2227de46484213858eb3268aebb7 (patch) | |
| tree | db0d8e18a3c228b3848401bc37970a14ce7ef3ce /pkgs/development/pure-modules | |
| parent | fea02e30f1cce6a853c0b4724d503caee811f96f (diff) | |
| parent | 9626ffbf14981b7ab618ef85a8ef6ee917d13df4 (diff) | |
| download | nixpkgs-40e917d35d0c2227de46484213858eb3268aebb7.tar nixpkgs-40e917d35d0c2227de46484213858eb3268aebb7.tar.gz nixpkgs-40e917d35d0c2227de46484213858eb3268aebb7.tar.bz2 nixpkgs-40e917d35d0c2227de46484213858eb3268aebb7.tar.lz nixpkgs-40e917d35d0c2227de46484213858eb3268aebb7.tar.xz nixpkgs-40e917d35d0c2227de46484213858eb3268aebb7.tar.zst nixpkgs-40e917d35d0c2227de46484213858eb3268aebb7.zip | |
Merge pull request #29023 from obsidiansystems/deps-reorg
misc pkgs: Reorganize dependencies ahead of #26805
Diffstat (limited to 'pkgs/development/pure-modules')
| -rw-r--r-- | pkgs/development/pure-modules/glpk/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 452cf51e634..4927ac445f4 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; glpkWithExtras = lib.overrideDerivation glpk (attrs: { - propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ]; + propagatedBuildInputs = [ gmp libtool libmysql libiodbc ]; CPPFLAGS = "-I${gmp.dev}/include"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-gmp=yes" ]; }); - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure glpkWithExtras ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; |