From b04fc593e7b55fe1f74421b11589f12a339c92e2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 31 Dec 2020 14:48:55 +0700 Subject: treewide: cmake buildInputs to nativeBuildInputs, minor cleanups --- pkgs/misc/my-env/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/misc/my-env') diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index fb8de9b6a71f..8a35525b3e82 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -6,15 +6,15 @@ packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { name = "sdl"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx SDL_net]; }; }; } - # Then you can install it by: + # Then you can install it by: # $ nix-env -i env-sdl - # And you can load it simply calling: + # And you can load it simply calling: # $ load-env-sdl # and this will update your env vars to have 'make' and 'gcc' finding the SDL # headers and libs. @@ -29,7 +29,7 @@ let complicatedMyEnv = { name, buildInputs ? [], cTags ? [], extraCmds ? ""}: pkgs.myEnvFun { inherit name; - buildInputs = buildInputs + buildInputs = buildInputs ++ map (x : sourceWithTagsDerivation ( (addCTaggingInfo x ).passthru.sourceWithTags ) ) cTags; extraCmds = '' -- cgit v1.2.3