nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc pkgs: Recategorize some dependencies

Browse Source
This commit is contained in:
John Ericson 2017-08-14 16:39:03 -04:00 committed by John Ericson
parent 991654fa4a
commit 252b36a28d
13 changed files with 19 additions and 17 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"; sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
}; };
nativeBuildInputs = [ x11 libXmu libXi ]; buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ];
propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ];
patchPhase = '' patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux 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" ]; outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; buildInputs = [ xlibsWrapper libXmu libXi ];
propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
patchPhase = '' patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux 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 outputs = [ "out" ]; # this package has no runtime components
propagatedNativeBuildInputs = [ cmake pkgconfig ]; propagatedBuildInputs = [ cmake pkgconfig ];
setupHook = ./setup-hook.sh; 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: { glpkWithExtras = lib.overrideDerivation glpk (attrs: {
propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ]; propagatedBuildInputs = [ gmp libtool libmysql libiodbc ];
CPPFLAGS = "-I${gmp.dev}/include"; CPPFLAGS = "-I${gmp.dev}/include";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
"--with-gmp=yes" ]; "--with-gmp=yes" ];
}); });
buildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ pure glpkWithExtras ]; propagatedBuildInputs = [ pure glpkWithExtras ];
makeFlags = "libdir=$(out)/lib prefix=$(out)/"; makeFlags = "libdir=$(out)/lib prefix=$(out)/";
setupHook = ../generic-setup-hook.sh; 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"; sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh";
}; };
buildInputs = [m4 perl lzma]; nativebuildInputs = [ lzma ];
buildInputs = [ m4 perl ];
doCheck = true; doCheck = true;

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

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l";
}; };
buildInputs = [ makeWrapper perl gettext LocaleGettext ]; nativeBuildInputs = [ makeWrapper gettext LocaleGettext ];
buildInputs = [ perl LocaleGettext ];
doCheck = false; # target `check' is missing 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" ]; outputs = [ "out" "lib" ];
propagatedNativeBuildInputs = [ m4 ];
nativeBuildInputs = [ perl help2man ]; nativeBuildInputs = [ perl help2man ];
propagatedBuildInputs = [ m4 ];
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files! # "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 ]; nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ];
propagatedNativeBuildInputs = [ m4 ]; propagatedBuildInputs = [ m4 ];
crossAttrs = { crossAttrs = {
preConfigure = '' preConfigure = ''

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ bison ]; buildInputs = [ bison ];
propagatedNativeBuildInputs = [ m4 ]; propagatedBuildInputs = [ m4 ];
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;' 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 ]; buildInputs = [ bison ];
propagatedNativeBuildInputs = [ m4 ]; propagatedBuildInputs = [ m4 ];
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;' sed -i Makefile -e 's/-no-undefined//;'

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

@ -6,7 +6,7 @@ with stdenv.lib;
overrideDerivation xorgserver (oldAttrs: { overrideDerivation xorgserver (oldAttrs: {
name = "xwayland-${xorgserver.version}"; name = "xwayland-${xorgserver.version}";
propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs propagatedBuildInputs = oldAttrs.propagatedBuildInputs
++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
configureFlags = [ configureFlags = [
"--disable-docs" "--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; nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs;
propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs; propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; 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; { meta = with stdenv.lib; {
description = "Allows to preview a KDecoration plugin"; description = "Allows to preview a KDecoration plugin";