alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #29023 from obsidiansystems/deps-reorg

Browse source 
misc pkgs: Reorganize dependencies ahead of #26805
This commit is contained in:
John Ericson 2017-09-05 18:10:32 -04:00 committed by GitHub
parent fea02e30f1 9626ffbf14
commit 40e917d35d
14 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/glew/1.10.nix
View file

@ -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

4
pkgs/development/libraries/glew/default.nix
View file

@ -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

2
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
View file

@ -7,7 +7,7 @@ mkDerivation {
outputs = [ "out" ]; # this package has no runtime components
propagatedNativeBuildInputs = [ cmake pkgconfig ];
propagatedBuildInputs = [ cmake pkgconfig ];
setupHook = ./setup-hook.sh;

4
pkgs/development/pure-modules/glpk/default.nix
View file

@ -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;

3
pkgs/development/tools/misc/autoconf/2.13.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh";
};
buildInputs = [m4 perl lzma];
nativebuildInputs = [ lzma ];
buildInputs = [ m4 perl ];
doCheck = true;

3
pkgs/development/tools/misc/help2man/default.nix
View file

@ -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

2
pkgs/development/tools/misc/libtool/libtool2.nix
View file

@ -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!

2
pkgs/development/tools/parsing/flex/2.5.35.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ];
propagatedNativeBuildInputs = [ m4 ];
propagatedBuildInputs = [ m4 ];
crossAttrs = {
preConfigure = ''

2
pkgs/development/tools/parsing/flex/2.6.1.nix
View file

@ -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//;'

2
pkgs/development/tools/parsing/flex/default.nix
View file

@ -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//;'

10
pkgs/misc/my-env/default.nix
View file

@ -62,11 +62,7 @@
, cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}:
mkDerivation {
# The setup.sh script from stdenv will expect the native build inputs in
# the nativeBuildInputs environment variable.
nativeBuildInputs = [ ] ++ buildInputs;
# Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs
propagatedBuildInputs2 = propagatedBuildInputs;
inherit buildInputs propagatedBuildInputs;
name = "env-${name}";
phases = [ "buildPhase" "fixupPhase" ];
@ -89,8 +85,8 @@ mkDerivation {
"$setupNew" > "$s"
cat >> "$out/dev-envs/''${name/env-/}" << EOF
defaultNativeBuildInputs="$defaultNativeBuildInputs"
nativeBuildInputs="$nativeBuildInputs"
propagatedBuildInputs="$propagatedBuildInputs2"
buildInputs="$buildInputs"
propagatedBuildInputs="$propagatedBuildInputs"
# the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards
tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)"
NIX_BUILD_TOP="\$tmp"

2
pkgs/servers/x11/xorg/xwayland.nix
View file

@ -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"

2
pkgs/tools/admin/tigervnc/default.nix
View file

@ -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;

3
pkgs/tools/misc/kdecoration-viewer/default.nix
View file

@ -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";