Merge pull request #106102 from fgaz/pikopixel/init

pikopixel: init at 1.0-b9e
2021-01-19 14:13:59 +01:00
parent 6bc77f6fd4 ae16a68336
commit 550ff33d62
3 changed files with 57 additions and 6 deletions
@@ -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 {};
  };