diff options
author | Francesco Gazzetta <fgaz@fgaz.me> | 2020-12-06 22:42:08 +0100 |
---|---|---|
committer | Francesco Gazzetta <fgaz@fgaz.me> | 2020-12-06 22:42:08 +0100 |
commit | 357ef10f544766af3347a7534a0c244e7603292f (patch) | |
tree | 469fdbf6dcfe869d6eeb1ca7c72115e04c52a6d2 /pkgs/desktops/gnustep | |
parent | 1e5a7a913514a8746ae94819c9591e13ed8f21f7 (diff) | |
download | nixlib-357ef10f544766af3347a7534a0c244e7603292f.tar nixlib-357ef10f544766af3347a7534a0c244e7603292f.tar.gz nixlib-357ef10f544766af3347a7534a0c244e7603292f.tar.bz2 nixlib-357ef10f544766af3347a7534a0c244e7603292f.tar.lz nixlib-357ef10f544766af3347a7534a0c244e7603292f.tar.xz nixlib-357ef10f544766af3347a7534a0c244e7603292f.tar.zst nixlib-357ef10f544766af3347a7534a0c244e7603292f.zip |
gnustep: make llvmPackages easily overridable
Diffstat (limited to 'pkgs/desktops/gnustep')
-rw-r--r-- | pkgs/desktops/gnustep/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix index 4f7c13e8e4ae..abbabd4abf29 100644 --- a/pkgs/desktops/gnustep/default.nix +++ b/pkgs/desktops/gnustep/default.nix @@ -1,21 +1,22 @@ -{ pkgs, newScope, llvmPackages_6 }: +{ newScope +, llvmPackages +, giflib_4_1 +}: let callPackage = newScope self; self = rec { - stdenv = pkgs.clangStdenv; + stdenv = llvmPackages.stdenv; gsmakeDerivation = callPackage ./make/gsmakeDerivation.nix {}; gorm = callPackage ./gorm {}; projectcenter = callPackage ./projectcenter {}; system_preferences = callPackage ./systempreferences {}; - libobjc = callPackage ./libobjc2 { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + libobjc = callPackage ./libobjc2 {}; make = callPackage ./make {}; back = callPackage ./back {}; - base = callPackage ./base { giflib = pkgs.giflib_4_1; }; + base = callPackage ./base { giflib = giflib_4_1; }; gui = callPackage ./gui {}; gworkspace = callPackage ./gworkspace {}; }; |