Skip to content

Commit

Permalink
Merge pull request #37658 from pbogdan/gnumake3-remove
Browse files Browse the repository at this point in the history
gnumake3: remove
  • Loading branch information
Mic92 committed Nov 15, 2018
2 parents c957808 + 2c60a41 commit 3516b2d
Show file tree
Hide file tree
Showing 17 changed files with 8 additions and 620 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/coq2html/default.nix
@@ -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
@@ -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 ];
buildInputs = [ glib zlib libpng ];

configureFlags = [ "-v" ];

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

62 changes: 0 additions & 62 deletions pkgs/development/tools/build-managers/gnumake/3.82/default.nix

This file was deleted.

0 comments on commit 3516b2d

Please sign in to comment.