Merge pull request #29023 from obsidiansystems/deps-reorg

misc pkgs: Reorganize dependencies ahead of #26805
2017-09-05 18:10:32 -04:00
parent fea02e30f1 9626ffbf14
commit 40e917d35d
14 changed files with 22 additions and 24 deletions
@@ -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;