diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/glew/1.10.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/glew/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 159bf47e130..3f8119d36d6 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 814e4496b77..57bb4cb631d 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 86be0398e06..654eb94b51a 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; |