about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2008-06-06 07:50:52 +0000
committerMichael Raskin <7c6f434c@mail.ru>2008-06-06 07:50:52 +0000
commit7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015 (patch)
tree2a28f6427d3ff8c7a9095c8ffea664993bb19749 /pkgs/top-level
parentefa2ae30bd57b84a7af61215482d26f46fb69126 (diff)
downloadnixlib-7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015.tar
nixlib-7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015.tar.gz
nixlib-7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015.tar.bz2
nixlib-7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015.tar.lz
nixlib-7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015.tar.xz
nixlib-7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015.tar.zst
nixlib-7ed0f3983d8d2cd0ccac33baecfc5fb98cba8015.zip
Not using dependencies when building statically..
svn path=/nixpkgs/trunk/; revision=11995
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42c3fc7017a6..811b50e589a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -113,6 +113,7 @@ let pkgs = rec {
           (if args ? configureFlags then args.configureFlags else "")
           + " --disable-shared"; # brrr...
       });
+      isStatic = true;
     };
 
   # Applying this to an attribute set will cause nix-env to look
@@ -528,8 +529,8 @@ let pkgs = rec {
   curl = import ../tools/networking/curl {
     fetchurl = fetchurlBoot;
     inherit stdenv zlib openssl;
-    zlibSupport = !stdenv ? isDietLibC;
-    sslSupport = !stdenv ? isDietLibC;
+    zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
+    sslSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
   };
 
   curlftpfs = import ../tools/networking/curlftpfs {