summary refs log tree commit diff
path: root/pkgs/desktops/gnustep
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-04-22 21:16:59 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-04-26 21:55:01 -0400
commitc72c6a48ca2c3090ea94df4474695524b5e68f9c (patch)
treebe1edf7f7c154f5387c59993b8c4f7e9ae83aaeb /pkgs/desktops/gnustep
parentffeffb3851fa0e53e248ec93b977098826514bad (diff)
downloadnixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.gz
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.bz2
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.lz
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.xz
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.zst
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.zip
treewide: use llvm6 in some places
Not everything works on llvm7. It’s easiest to just provide the llvm6
as backup in this case.
Diffstat (limited to 'pkgs/desktops/gnustep')
-rw-r--r--pkgs/desktops/gnustep/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix
index ac324bc89a8..1fdf79ef9ae 100644
--- a/pkgs/desktops/gnustep/default.nix
+++ b/pkgs/desktops/gnustep/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, newScope }:
+{ pkgs, newScope, stdenv, llvmPackages_6 }:
 
 let
   callPackage = newScope self;
@@ -10,7 +10,9 @@ let
     gorm = callPackage ./gorm {};
     projectcenter = callPackage ./projectcenter {};
     system_preferences = callPackage ./systempreferences {};
-    libobjc = callPackage ./libobjc2 {};
+    libobjc = callPackage ./libobjc2 {
+      stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
+    };
     make = callPackage ./make {};
     back = callPackage ./back {};
     base = callPackage ./base { giflib = pkgs.giflib_4_1; };