diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2020-12-31 14:48:55 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-01 11:52:33 +0700 |
| commit | b04fc593e7b55fe1f74421b11589f12a339c92e2 (patch) | |
| tree | fa9bbaeb68f1e0cfa6ea2f9580ea2892eed41b3e /pkgs/misc/my-env | |
| parent | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (diff) | |
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
Diffstat (limited to 'pkgs/misc/my-env')
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index fb8de9b6a71f8..8a35525b3e828 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 = '' |