diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/pick/default.nix | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c3f4863fe6f5..9a422a96d703 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -76,8 +76,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1"; - makeFlags = optionalString hostPlatform.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. preInstall = optionalString (hostPlatform != buildPlatform) '' diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 5fda26bacad1..747c98376410 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }: +{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: stdenv.mkDerivation rec { name = "pick-${version}"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "calleerlandsson"; repo = "pick"; rev = "v${version}"; - sha256 = "1x7ql530rj4yj50dzp8526mz92g4hhqxnig1qgiq3h3k815p31qb"; + sha256 = "0s0mn9iz17ldhvahggh9rsmgfrjh0kvk5bh4p9xhxcn7rcp0h5ka"; }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook ]; - - postPatch = '' - sed -i -e 's/\[curses]/\[ncurses]/g' configure.ac - ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = with stdenv.lib; { inherit (src.meta) homepage; |