Unverified Commit b2127e76 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

treewide: cleanup own packages to utilize the new apple-sdk (#352699)

parents 3e6c915e fcec676c

pkgs/by-name/co/comet-gog/package.nix

+0 −10
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  rustPlatform,

  fetchFromGitHub,

  protobuf,

  darwin,

}:



let

  inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration;

in

rustPlatform.buildRustPackage rec {

  pname = "comet-gog";

  version = "0.1.2";
@@ -31,11 +26,6 @@ rustPlatform.buildRustPackage rec { 


  env.PROTOC = lib.getExe' protobuf "protoc";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    CoreFoundation

    SystemConfiguration

  ];



  meta = {

    changelog = "https://github.com/imLinguin/comet/releases/tag/v${version}";

    description = "Open Source implementation of GOG Galaxy's Communication Service";

pkgs/by-name/en/en-croissant/package.nix

+3 −12
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  overrideSDK,

  rustPlatform,

  fetchFromGitHub,
@@ -16,15 +15,10 @@ 
  libsoup,

  webkitgtk_4_0,

  gst_all_1,

  darwin,

  apple-sdk_11,

}:



let

  buildRustPackage = rustPlatform.buildRustPackage.override {

    stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;

  };

in

buildRustPackage rec {

rustPlatform.buildRustPackage rec {

  pname = "en-croissant";

  version = "0.11.1";
@@ -72,10 +66,7 @@ buildRustPackage rec { 
      gst_all_1.gst-plugins-bad

      gst_all_1.gst-plugins-good

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      darwin.apple_sdk_11_0.frameworks.Cocoa

      darwin.apple_sdk_11_0.frameworks.WebKit

    ];

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];



  doCheck = false; # many scoring tests fail

pkgs/by-name/gc/gcs/package.nix

+6 −6
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  buildGoModule,

  buildNpmPackage,

  fetchFromGitHub,
@@ -16,8 +17,7 @@ 
  mupdf,

  fontconfig,

  freetype,

  stdenv,

  darwin,

  apple-sdk_11,

}:



buildGoModule rec {
@@ -76,6 +76,9 @@ buildGoModule rec { 


  buildInputs =

    [

      mupdf

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      libGL

      libX11

      libXcursor
@@ -83,14 +86,11 @@ buildGoModule rec { 
      libXinerama

      libXi

      libXxf86vm

      mupdf

      fontconfig

      freetype

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      darwin.apple_sdk_11_0.frameworks.Carbon

      darwin.apple_sdk_11_0.frameworks.Cocoa

      darwin.apple_sdk_11_0.frameworks.Kernel

      apple-sdk_11

    ];



  # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh

pkgs/by-name/hi/hieroglyphic/package.nix

+5 −14
Original line number Diff line number Diff line
@@ -13,14 +13,10 @@ 
  glib,

  gtk4,

  libadwaita,

  darwin,

  gettext,

  appstream,

}:



let

  inherit (darwin.apple_sdk.frameworks) CoreFoundation Foundation;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "hieroglyphic";

  version = "1.1.0";
@@ -53,15 +49,10 @@ stdenv.mkDerivation (finalAttrs: { 
    appstream

  ];



  buildInputs =

    [

  buildInputs = [

    glib

    gtk4

    libadwaita

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      CoreFoundation

      Foundation

  ];



  # needed for darwin

pkgs/by-name/ka/kando/package.nix

+5 −9
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  stdenv,

  buildNpmPackage,

  fetchFromGitHub,

  overrideSDK,



  electron,

  nodejs,
@@ -20,15 +19,10 @@ 
  libXtst,

  libXi,

  wayland,

  darwin,

  apple-sdk_11,

}:



let

  buildNpmPackage' = buildNpmPackage.override {

    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;

  };

in

buildNpmPackage' rec {

buildNpmPackage rec {

  pname = "kando";

  version = "1.4.0";
@@ -64,7 +58,9 @@ buildNpmPackage' rec { 
      libXi

      wayland

    ]

    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ];

    ++ lib.optionals stdenv.isDarwin [

      apple-sdk_11

    ];



  dontUseCmakeConfigure = true;