summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDavid Guibert <david.guibert@gmail.com>2016-03-31 10:37:02 +0200
committerDavid Guibert <david.guibert@gmail.com>2016-03-31 10:37:02 +0200
commit7f69d5ed8c47beafc04efb88aeb818b84b48c2e2 (patch)
tree46c44b0c218f82585a37cce4169bcfd3d3b72cd2 /pkgs
parentc94f8a4abd521debf926be2f8523edcf643a8ce2 (diff)
downloadnixpkgs-7f69d5ed8c47beafc04efb88aeb818b84b48c2e2.tar
nixpkgs-7f69d5ed8c47beafc04efb88aeb818b84b48c2e2.tar.gz
nixpkgs-7f69d5ed8c47beafc04efb88aeb818b84b48c2e2.tar.bz2
nixpkgs-7f69d5ed8c47beafc04efb88aeb818b84b48c2e2.tar.lz
nixpkgs-7f69d5ed8c47beafc04efb88aeb818b84b48c2e2.tar.xz
nixpkgs-7f69d5ed8c47beafc04efb88aeb818b84b48c2e2.tar.zst
nixpkgs-7f69d5ed8c47beafc04efb88aeb818b84b48c2e2.zip
skype: build qt4 with the 32bits clangStdenv
This allows to build skype without errors like this:
clang++ -Wl,-O1 -o libmng libmng.o     -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/72nklasrjg774iwxxnpyxwkzxz2j37v5-libmng-2.0.2/lib/libmng.so when searching for -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: cannot find -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.so when searching for -lm
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.a when searching for -lm
clang-3.7: error: linker command failed with exit code 1 (use -v to see invocation)
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d40165b05d2..e2d75da40ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13612,7 +13612,7 @@ in
 
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
     qt4 = pkgsi686Linux.qt4.override {
-      stdenv = clangStdenv;
+      stdenv = pkgsi686Linux.clangStdenv;
     };
   };