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

Merge pull request #226929 from cransom/pcb2gcode-darwin 

pcb2gcode: fix build on darwin
parents 01cbd79e 3ed1e3b2

pkgs/applications/science/electronics/gerbv/default.nix

+10 −9
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:

{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2-x11, autoreconfHook }:



stdenv.mkDerivation {

stdenv.mkDerivation rec {

  pname = "gerbv";

  version = "2015-10-08";

  version = "2.7.0";



  src = fetchgit {

    url = "git://git.geda-project.org/gerbv.git";

    rev = "76b8b67bfa10823ce98f1c4c3b49a2afcadf7659";

    sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";

  src = fetchurl {

    url = "mirror://sourceforge/gerbv/${pname}-${version}.tar.gz";

    sha256 = "sha256-xe6AjEIwzmvjrRCrY8VHCYOG1DAicE3iXduTeOYgU7Q=";

  };



  patches = [
@@ -21,15 +20,17 @@ stdenv.mkDerivation { 
  ];



  nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];

  buildInputs = [ gettext libtool cairo gtk2 ];

  buildInputs = [ gettext libtool cairo gtk2-x11 ];



  configureFlags = ["--disable-update-desktop-database"];



  env.NIX_CFLAGS_COMPILE = "-Wno-format-security";



  meta = with lib; {

    description = "A Gerber (RS-274X) viewer";

    homepage = "http://gerbv.geda-project.org/";

    maintainers = with maintainers; [ mog ];

    platforms = platforms.linux;

    platforms = platforms.unix;

    license = licenses.gpl2;

  };

}

pkgs/tools/misc/pcb2gcode/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/pcb2gcode/pcb2gcode";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ kritnich ];

    platforms = platforms.linux;

    platforms = platforms.unix;

  };

}

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -37859,7 +37859,9 @@ with pkgs; 
    guile = guile_2_0;

  };













  gerbv = callPackage ../applications/science/electronics/gerbv { };













  gerbv = callPackage ../applications/science/electronics/gerbv {













    cairo = cairo.override { x11Support = true; };













  };





























  gtkwave = callPackage ../applications/science/electronics/gtkwave { };