diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-19 14:13:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-19 14:13:59 +0100 |
commit | 550ff33d623c15f1b9c8d55eee2178ae5f54407e (patch) | |
tree | 8c7492effa3444263f72b8150defe1500325190b /pkgs/desktops/gnustep | |
parent | 6bc77f6fd471604c1dafda8e358637e8f99a78a7 (diff) | |
parent | ae16a68336da531f3104a0c0bc93cc729e56276d (diff) | |
download | nixlib-550ff33d623c15f1b9c8d55eee2178ae5f54407e.tar nixlib-550ff33d623c15f1b9c8d55eee2178ae5f54407e.tar.gz nixlib-550ff33d623c15f1b9c8d55eee2178ae5f54407e.tar.bz2 nixlib-550ff33d623c15f1b9c8d55eee2178ae5f54407e.tar.lz nixlib-550ff33d623c15f1b9c8d55eee2178ae5f54407e.tar.xz nixlib-550ff33d623c15f1b9c8d55eee2178ae5f54407e.tar.zst nixlib-550ff33d623c15f1b9c8d55eee2178ae5f54407e.zip |
Merge pull request #106102 from fgaz/pikopixel/init
pikopixel: init at 1.0-b9e
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 {}; }; |