diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-23 14:45:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-23 14:45:44 +0100 |
| commit | 13eca6f79a0ddb09f6764273eaae0df4c2e67efc (patch) | |
| tree | 46052bf5c0aa6feb9074e7fa2dd44dbb4051f15f /pkgs/tools/misc | |
| parent | 5bc8241348a52fe7d4d88d0a6693748417a2baea (diff) | |
| parent | baf7fdcb753fc57058ba27fc335b2798fbac804a (diff) | |
| download | nixlib-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar nixlib-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.gz nixlib-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.bz2 nixlib-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.lz nixlib-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.xz nixlib-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.tar.zst nixlib-13eca6f79a0ddb09f6764273eaae0df4c2e67efc.zip | |
Merge #11067: SmartOS updates
I amended some commits slightly.
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/less/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 35e9e3828d93..0943c1a026b3 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -36,6 +36,8 @@ let touch -r src/stat.c src/tail.c ''; + configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no"; + nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl @@ -80,6 +82,7 @@ let enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; + FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; @@ -103,6 +106,3 @@ let }; in self - // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { - FORCE_UNSAFE_CONFIGURE = 1; - } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index af8a0dd7d81b..75e00635320a 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.greenwoodsoftware.com/less/; description = "A more advanced file pager than ‘more’"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } |