diff options
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/shells/bash/default.nix | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 59713bb8d20..92bde5deb97 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -64,9 +64,6 @@ stdenv.mkDerivation rec { makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; - # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds - cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null; - passthru.version = version; meta = with stdenv.lib; { diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 2fa229692eb..49d149eb183 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = if (!interactive) # conditional to avoid mass rebuild ATM - then [ "out" "doc" ] - else [ "out" "doc" "info" ]; + outputs = [ "out" "doc" "info" ]; # the man pages are small and useful enough outputMan = if interactive then "out" else null; |