tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

misc pkgs: Recategorize some dependencies

authored by John Ericson and committed by John Ericson 252b36a2 991654fa

+19 -17
unified split
+2 -3
pkgs/development/libraries/glew/1.10.nix
··· 13 13 sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; 14 14 }; 15 15 16 - nativeBuildInputs = [ x11 libXmu libXi ]; 17 - propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h 18 - buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ]; 16 + buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; 17 + propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h 19 18 20 19 patchPhase = '' 21 20 sed -i 's|lib64|lib|' config/Makefile.linux
+2 -2
pkgs/development/libraries/glew/default.nix
··· 14 14 15 15 outputs = [ "bin" "out" "dev" "doc" ]; 16 16 17 - nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; 18 - propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h 17 + buildInputs = [ xlibsWrapper libXmu libXi ]; 18 + propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h 19 19 20 20 patchPhase = '' 21 21 sed -i 's|lib64|lib|' config/Makefile.linux
+1 -1
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
··· 7 7 8 8 outputs = [ "out" ]; # this package has no runtime components 9 9 10 - propagatedNativeBuildInputs = [ cmake pkgconfig ]; 10 + propagatedBuildInputs = [ cmake pkgconfig ]; 11 11 12 12 setupHook = ./setup-hook.sh; 13 13
+2 -2
pkgs/development/pure-modules/glpk/default.nix
··· 12 12 }; 13 13 14 14 glpkWithExtras = lib.overrideDerivation glpk (attrs: { 15 - propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ]; 15 + propagatedBuildInputs = [ gmp libtool libmysql libiodbc ]; 16 16 17 17 CPPFLAGS = "-I${gmp.dev}/include"; 18 18 ··· 26 26 "--with-gmp=yes" ]; 27 27 }); 28 28 29 - buildInputs = [ pkgconfig ]; 29 + nativeBuildInputs = [ pkgconfig ]; 30 30 propagatedBuildInputs = [ pure glpkWithExtras ]; 31 31 makeFlags = "libdir=$(out)/lib prefix=$(out)/"; 32 32 setupHook = ../generic-setup-hook.sh;
+2 -1
pkgs/development/tools/misc/autoconf/2.13.nix
··· 8 8 sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; 9 9 }; 10 10 11 - buildInputs = [m4 perl lzma]; 11 + nativebuildInputs = [ lzma ]; 12 + buildInputs = [ m4 perl ]; 12 13 13 14 doCheck = true; 14 15
+2 -1
pkgs/development/tools/misc/help2man/default.nix
··· 8 8 sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; 9 9 }; 10 10 11 - buildInputs = [ makeWrapper perl gettext LocaleGettext ]; 11 + nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; 12 + buildInputs = [ perl LocaleGettext ]; 12 13 13 14 doCheck = false; # target `check' is missing 14 15
+1 -1
pkgs/development/tools/misc/libtool/libtool2.nix
··· 12 12 13 13 outputs = [ "out" "lib" ]; 14 14 15 - propagatedNativeBuildInputs = [ m4 ]; 16 15 nativeBuildInputs = [ perl help2man ]; 16 + propagatedBuildInputs = [ m4 ]; 17 17 18 18 # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the 19 19 # "fixed" path in generated files!
+1 -1
pkgs/development/tools/parsing/flex/2.5.35.nix
··· 10 10 11 11 nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ]; 12 12 13 - propagatedNativeBuildInputs = [ m4 ]; 13 + propagatedBuildInputs = [ m4 ]; 14 14 15 15 crossAttrs = { 16 16 preConfigure = ''
+1 -1
pkgs/development/tools/parsing/flex/2.6.1.nix
··· 10 10 11 11 buildInputs = [ bison ]; 12 12 13 - propagatedNativeBuildInputs = [ m4 ]; 13 + propagatedBuildInputs = [ m4 ]; 14 14 15 15 postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' 16 16 sed -i Makefile -e 's/-no-undefined//;'
+1 -1
pkgs/development/tools/parsing/flex/default.nix
··· 11 11 12 12 buildInputs = [ bison ]; 13 13 14 - propagatedNativeBuildInputs = [ m4 ]; 14 + propagatedBuildInputs = [ m4 ]; 15 15 16 16 postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' 17 17 sed -i Makefile -e 's/-no-undefined//;'
+1 -1
pkgs/servers/x11/xorg/xwayland.nix
··· 6 6 overrideDerivation xorgserver (oldAttrs: { 7 7 8 8 name = "xwayland-${xorgserver.version}"; 9 - propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs 9 + propagatedBuildInputs = oldAttrs.propagatedBuildInputs 10 10 ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; 11 11 configureFlags = [ 12 12 "--disable-docs"
+1 -1
pkgs/tools/admin/tigervnc/default.nix
··· 87 87 88 88 nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; 89 89 90 - propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs; 90 + propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; 91 91 92 92 enableParallelBuilding = true; 93 93
+2 -1
pkgs/tools/misc/kdecoration-viewer/default.nix
··· 11 11 sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; 12 12 }; 13 13 14 - buildInputs = [ cmake extra-cmake-modules qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; 14 + nativeBuildInputs = [ cmake extra-cmake-modules ]; 15 + buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; 15 16 16 17 meta = with stdenv.lib; { 17 18 description = "Allows to preview a KDecoration plugin";