From 252b36a28db1dd9036cfcbfbaa64b63e6ea5655a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 14 Aug 2017 16:39:03 -0400 Subject: [PATCH] misc pkgs: Recategorize some dependencies --- pkgs/development/libraries/glew/1.10.nix | 5 ++--- pkgs/development/libraries/glew/default.nix | 4 ++-- .../libraries/kde-frameworks/extra-cmake-modules/default.nix | 2 +- pkgs/development/pure-modules/glpk/default.nix | 4 ++-- pkgs/development/tools/misc/autoconf/2.13.nix | 3 ++- pkgs/development/tools/misc/help2man/default.nix | 3 ++- pkgs/development/tools/misc/libtool/libtool2.nix | 2 +- pkgs/development/tools/parsing/flex/2.5.35.nix | 2 +- pkgs/development/tools/parsing/flex/2.6.1.nix | 2 +- pkgs/development/tools/parsing/flex/default.nix | 2 +- pkgs/servers/x11/xorg/xwayland.nix | 2 +- pkgs/tools/admin/tigervnc/default.nix | 2 +- pkgs/tools/misc/kdecoration-viewer/default.nix | 3 ++- 13 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 159bf47e130a..3f8119d36d65 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - nativeBuildInputs = [ x11 libXmu libXi ]; - propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h - buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ]; + buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; + propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 814e4496b77d..57bb4cb631d4 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; - nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; - propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + buildInputs = [ xlibsWrapper libXmu libXi ]; + propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 86be0398e06f..654eb94b51ac 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -7,7 +7,7 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components - propagatedNativeBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkgconfig ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 452cf51e6347..4927ac445f44 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; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 0b32f02f2583..d47483376261 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - buildInputs = [m4 perl lzma]; + nativebuildInputs = [ lzma ]; + buildInputs = [ m4 perl ]; doCheck = true; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 5e2edce56f0d..ada2dd1a89a1 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; }; - buildInputs = [ makeWrapper perl gettext LocaleGettext ]; + nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; + buildInputs = [ perl LocaleGettext ]; doCheck = false; # target `check' is missing diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index f25fbcd00d84..bf134c459d97 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; - propagatedNativeBuildInputs = [ m4 ]; nativeBuildInputs = [ perl help2man ]; + propagatedBuildInputs = [ m4 ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index f3357de867ea..4f78b0c71c16 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ]; - propagatedNativeBuildInputs = [ m4 ]; + propagatedBuildInputs = [ m4 ]; crossAttrs = { preConfigure = '' diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 7ee2e27e60ad..f27fac9bcb5d 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; - propagatedNativeBuildInputs = [ m4 ]; + propagatedBuildInputs = [ m4 ]; postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index addf3b6197a3..92fba47b756f 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; - propagatedNativeBuildInputs = [ m4 ]; + propagatedBuildInputs = [ m4 ]; postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 513e4ceee623..28463dc6163c 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -6,7 +6,7 @@ with stdenv.lib; overrideDerivation xorgserver (oldAttrs: { name = "xwayland-${xorgserver.version}"; - propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; configureFlags = [ "--disable-docs" diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 3df01dccced8..33731688cac3 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; - propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs; + propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 33ccf28cb0da..62783bb30dff 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; }; - buildInputs = [ cmake extra-cmake-modules qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; meta = with stdenv.lib; { description = "Allows to preview a KDecoration plugin";