Unverified Commit c2aa9120 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #212123 from atorres1985-contrib/misc-updates 

Misc changes
parents c3f76c22 f4bc3054

pkgs/development/tools/castxml/default.nix

+11 −11
Original line number Diff line number Diff line 
{ lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  libffi,

  libxml2,

  zlib,

  withManual ? true,

  withHTML ? true,

  llvmPackages,

  python3,

{ lib

, stdenv

, fetchFromGitHub

, cmake

, libffi

, libxml2

, zlib

, withManual ? true

, withHTML ? true

, llvmPackages

, python3

}:



let

pkgs/tools/graphics/wallutils/default.nix

+29 −15
Original line number Diff line number Diff line 
{ lib

, buildGoModule

, fetchFromGitHub

, pkg-config

, wayland

, libX11

, xbitmaps

, libXcursor

, libXmu

, libXpm

, libheif

, pkg-config

, wayland

, xbitmaps

}:



buildGoModule rec {

  pname = "wallutils";

  version = "5.12.4";

  version = "5.12.5";



  src = fetchFromGitHub {

    owner = "xyproto";

    repo = "wallutils";

    rev = version;

    sha256 = "sha256-NODG4Lw/7X1aoT+dDSWxWEbDX6EAQzzDJPwsWOLaJEM=";

    hash = "sha256-qC+AF+NFXSrUZAYaiFPwvfZtsAGhKE4XFDOUcfXUAbM=";

  };



  vendorSha256 = null;



  patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];

  patches = [

    ./000-add-nixos-dirs-to-default-wallpapers.patch

  ];



  excludedPackages = [

    "./pkg/event/cmd" # Development tools

  ];



  ldflags = [ "-s" "-w" ];

  nativeBuildInputs = [

    pkg-config

  ];



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ];

  buildInputs = [

    libX11

    libXcursor

    libXmu

    libXpm

    libheif

    wayland

    xbitmaps

  ];



  ldflags = [ "-s" "-w" ];



  preCheck =

    let skippedTests = [

      "TestClosest" # Requiring Wayland or X.

      "TestNewSimpleEvent" # Blocking

      "TestClosest" # Requiring Wayland or X

      "TestEveryMinute" # Blocking

      "TestNewSimpleEvent" # Blocking

    ]; in

    ''

      export XDG_RUNTIME_DIR=`mktemp -d`
@@ -47,11 +60,12 @@ buildGoModule rec { 
      buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")

    '';



  meta = with lib; {

  meta = {

    description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";

    inherit (src.meta) homepage;

    license = licenses.bsd3;

    maintainers = with maintainers; [ ];

    platforms = platforms.linux;

    license = lib.licenses.bsd3;

    maintainers = [ lib.maintainers.AndersonTorres ];

    inherit (wayland.meta) platforms;

    badPlatforms = lib.platforms.darwin;

  };

}