Commit a0611ad7 authored by Audrey Dutcher's avatar Audrey Dutcher
Browse files

freebsd: format tree

parent e5516ab1

pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ mkDerivation { 
    "sys/sys/elf_common.h"

  ];

  extraNativeBuildInputs = [ m4 ];

  buildInputs = compatIfNeeded ++ [ zlib libelf ];

  buildInputs = compatIfNeeded ++ [

    zlib

    libelf

  ];

  MK_TESTS = "no";

}

pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix

+7 −3
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ mkDerivation { 
  ];



  # XXX mass rebuild moment

  postPatch = if withPwdMkdb == null then null else ''

  postPatch =

    if withPwdMkdb == null then

      null

    else

      ''

        substituteInPlace lib/libutil/pw_util.c --replace-fail _PATH_PWD_MKDB '"${lib.getExe withPwdMkdb}"'

      '';

pkgs/os-specific/bsd/freebsd/pkgs/nvidia-drm-kmod/package.nix

+27 −23
Original line number Diff line number Diff line
@@ -19,13 +19,15 @@ mkDerivation rec { 
    "debug"

  ];



  patches = lib.optionals (lib.versionOlder version "565") [

  patches =

    lib.optionals (lib.versionOlder version "565") [

      (fetchpatch {

        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/d07cdab9108a8cf6ab66aa1ff834339f8695f457/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h";

        extraPrefix = "a/src/nvidia-drm";

        hash = "sha256-EgzEx1VxQyoNpnY0MnNVa08A0ENSyU/rdRM2hOwUE2g=";

      })

  ] ++ lib.optionals (lib.versionOlder version "555") [

    ]

    ++ lib.optionals (lib.versionOlder version "555") [

      (fetchpatch {

        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/d07cdab9108a8cf6ab66aa1ff834339f8695f457/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c";

        extraPrefix = "a/src/nvidia-drm";
@@ -33,10 +35,12 @@ mkDerivation rec { 
      })

    ];



  postPatch = lib.optionalString (lib.versionAtLeast version "570") ''

  postPatch =

    lib.optionalString (lib.versionAtLeast version "570") ''

      sed -E -i -e 's:\&nv_drm_fbdev_module_param\,  1\,:\&nv_drm_fbdev_module_param\,  0\,:' src/nvidia-drm/nvidia-drm-freebsd-lkpi.c

      sed -E -i -e 's:bool nv_drm_fbdev_module_param = true;:bool nv_drm_fbdev_module_param = false;:' src/nvidia-drm/nvidia-drm-os-interface.c

  '' + ''

    ''

    + ''

      sed -E -i -e '/DRMKMODDIR.*\/linuxkpi\/dummy\/include/d' src/nvidia-drm/Makefile



      mkdir -p $TMP/bin

pkgs/os-specific/bsd/freebsd/pkgs/v4l-compat.nix

+5 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl }:

{

  lib,

  stdenv,

  fetchurl,

}:

let

  types_h = fetchurl {

    url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/3da53417998c611f340d75e45962da2fa912add5/multimedia/libv4l/files/types.h";

pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix

+6 −1
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, xorg, pkg-config }:

{

  stdenv,

  fetchFromGitHub,

  xorg,

  pkg-config,

}:

stdenv.mkDerivation rec {

  pname = "xf86-video-scfb";

  version = "0.0.7";

pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix

+1 −1

File changed.

Contains only whitespace changes.

pkgs/os-specific/bsd/freebsd/pkgs/nvidia-driver/package.nix

+1 −1

File changed.

Contains only whitespace changes.

pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix

+4 −4

File changed.

Contains only whitespace changes.