Commit bac4ae56 authored by Adkins, Cameron's avatar Adkins, Cameron
Browse files

fix: remove missing package p11-kit

parent 8e2faea5

pkgs/by-name/sk/skia/package.nix

+9 −11
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  fetchgit,

  expat,

  fontconfig,
@@ -27,16 +28,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "skia";

  # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md

  # or https://chromiumdash.appspot.com/releases

  # plus date of the tip of the corresponding chrome/m$version branch

  version = "129-unstable-2024-09-18";



  src = fetchgit {

    url = "https://skia.googlesource.com/skia.git";

    # Tip of the chrome/m$version branch

    rev = "dda581d538cb6532cda841444e7b4ceacde01ec9";

    hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals=";

  version = "m129-0.77.1";



  src = fetchFromGitHub {

    owner = "rust-skia";

    repo  = "skia";

    rev   = "m129-0.77.1";

    hash  = "sha256-WRVuQpfRnYrE7KGFRFx66fXtMFmtJbC3xUcRPK1JoOM=";

  };



  postPatch = ''
@@ -90,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { 
    [

      # Build in release mode

      "is_official_build=true"

      "is_component_build=true"

      #"is_component_build=true"

      # Don't use missing tools

      "skia_use_dng_sdk=false"

      "skia_use_wuffs=false"

pkgs/by-name/sl/slint/package.nix

0 → 100644
+149 −0
Original line number Diff line number Diff line 
{

  lib,

  linkFarm,

  rustPlatform,

  clangStdenv,

  fetchFromGitHub,

  runCommand,



  pkg-config,

  gn,

  ninja,

  makeWrapper,



  udev,

  seatd,

  glib,

  openssl,

  fontconfig,

  gst_all_1,

  ffmpeg,

  alsa-lib,

  libGL,

  xorg,

  libxkbcommon,

  wayland,

  python3,

  rust-cbindgen,

  libglvnd,



  freetype,

  libjpeg,

  expat,

  harfbuzz,

  icu

}:



rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {

  pname = "slint";

  version = "1.9.0";



  src = fetchFromGitHub {

    owner = "slint-ui";

    repo  = pname;

    rev = "v${version}";

    hash = "sha256-mE17L4xkjO0u939vZ1mBqErX2ncjcGR/y8j3sed/Wcc=";

  };



  nativeBuildInputs = [

    pkg-config

    fontconfig

    python3

    makeWrapper

    rustPlatform.bindgenHook

  ];



  buildInputs = [

    udev

    seatd

    glib

    openssl

    gst_all_1.gstreamer

    gst_all_1.gst-plugins-base

    ffmpeg

    alsa-lib

    libGL

    xorg.libxcb

    xorg.libX11

    xorg.libXcursor

    xorg.libXi

    xorg.libxcb

    libxkbcommon

    wayland



    # Skia

    fontconfig

    freetype

    libjpeg

    expat

    harfbuzz

    icu

  ];



  cargoDeps = rustPlatform.fetchCargoVendor {

    inherit pname version src;

    hash = "sha256-/V26qENAgQRsP9u9CG9+nHOuH2mgigIc1aDntcv3HvE=";

  };



  auditable = false;

  doCheck = false;

  cargoBuildFlags = [

    "--workspace"

    "--exclude test-driver-screenshots"

    "--exclude printerdemo_mcu"

    "--exclude uefi-demo"

  ];



  postFixup = ''

    for f in $out/bin/*; do

      wrapProgram $f \

        --prefix LD_LIBRARY_PATH : ${

          lib.makeLibraryPath [

            libxkbcommon

            libglvnd

            fontconfig

            xorg.libxcb

            xorg.libX11

            xorg.libXcursor

            xorg.libXi

            xorg.libxcb.dev

            wayland

          ]

        }

    done

  '';



  env = {

    SKIA_SOURCE_DIR = (

      let

        skia = fetchFromGitHub {

          owner = "rust-skia";

          repo  = "skia";

          rev   = "refs/tags/m129-0.77.1";

          hash  = "sha256-WRVuQpfRnYrE7KGFRFx66fXtMFmtJbC3xUcRPK1JoOM=";

        };



        externals = linkFarm "externals" [

          {

            name = "wuffs";

            path = fetchFromGitHub {

              owner = "google";

              repo  = "wuffs";

              rev   = "v0.3.3";

              hash  = "sha256-uIsdtWbFr1Recl/PvI1iEHthfv7K9OJ+J14YhbRvtcE=";

            };

          }

        ];

      in

        runCommand "source" { } ''

          cp -R ${skia} $out

          chmod -R +w $out

          ln -s ${externals} $out/third_party/externals

        ''

    );

    SKIA_GN_COMMAND = lib.getExe gn;

    SKIA_NINJA_COMMAND = lib.getExe ninja;

    SKIA_USE_SYSTEM_LIBRARIES = "1";

    NIX_CFLAGS_COMPILE = "-I${lib.getDev harfbuzz}/include/harfbuzz";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -10867,8 +10867,6 @@ with pkgs; 














  pacemaker = callPackage ../misc/logging/pacemaker { };



























  p11-kit = callPackage ../development/libraries/p11-kit { };



























  parsero = callPackage ../tools/security/parsero { };





























  pcaudiolib = callPackage ../development/libraries/pcaudiolib { };