Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gnumake3: remove #37658

Merged
merged 4 commits into from Nov 15, 2018
Merged

gnumake3: remove #37658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0244d8b
lensfun: switch to default make, move cmake to native build inputs
pbogdan Mar 22, 2018
20738d8
ngrep: switch to default make
pbogdan Mar 22, 2018
5d0eeee
coq2html: switch to default make
pbogdan Mar 22, 2018
2c60a41
gnumake3: remove
pbogdan Mar 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/coq2html/default.nix
View file
Open in desktop
@@ -1,4 +1,4 @@
{ stdenv, make, fetchgit, ocaml }:
{ stdenv, fetchgit, ocaml }:

let
version = "20170720";
Expand All @@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
};

buildInputs = [ make ocaml ];
buildInputs = [ ocaml ];

installPhase = ''
mkdir -p $out/bin
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/lensfun/default.nix
View file
Open in desktop
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }:
{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, cmake }:

stdenv.mkDerivation rec {
version = "0.3.95";
Expand All @@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib zlib libpng cmake gnumake3 ];
nativeBuildInputs = [ cmake pkgconfig ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add ninja, it is usually faster than make.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd think that in the context of Nix, make vs. ninja wouldn't make much difference. Ninja is certainly faster at determining that nothing needs to be done, but when you are building the project for the first time, and Ninja hasn't built up its databases yet, then I'd be surprised if the build time were changed significantly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I measured it and both ninja and make back-ends seem to average slightly above five seconds on my machine. For larger codebases, though, ninja is significantly faster even when building from scratch according to my experiments. http://voices.canonical.com/jussi.pakkanen/2012/02/28/speed-bumps-hide-in-places-where-you-least-expect-them/ agrees with my observations.

Copy link
Contributor

@orivej orivej Jun 3, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that individual packages built with CMake should switch to Ninja without a good reason; however I'd mildly approve switching all CMake projects in Nixpkgs to Ninja by default. The upsides of Ninja are possibly faster build, more concise output, better debugability (especially with issues of parallel building) due to the ability to query the build graph, but an irksome downside is that console output (compiler warnings and errors) is not colorized.

buildInputs = [ glib zlib libpng ];

configureFlags = [ "-v" ];

Expand Down
14 changes: 0 additions & 14 deletions pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions pkgs/development/tools/build-managers/gnumake/3.82/default.nix
View file
Open in desktop

This file was deleted.