diff options
| author | Casey Ransom <cransom@hubns.net> | 2023-04-18 16:44:14 -0400 |
|---|---|---|
| committer | Casey Ransom <cransom@hubns.net> | 2023-04-19 21:15:54 -0400 |
| commit | 3ed1e3b2686728050cab55f6309910ec9e960fa9 (patch) | |
| tree | 11a77de6612d5f777b651c994c29bf02c0f17762 | |
| parent | 9321f2c2a81148fdd5a8766889e28b21c521b3e2 (diff) | |
| download | nixpkgs-3ed1e3b2686728050cab55f6309910ec9e960fa9.tar nixpkgs-3ed1e3b2686728050cab55f6309910ec9e960fa9.tar.gz nixpkgs-3ed1e3b2686728050cab55f6309910ec9e960fa9.tar.bz2 nixpkgs-3ed1e3b2686728050cab55f6309910ec9e960fa9.tar.lz nixpkgs-3ed1e3b2686728050cab55f6309910ec9e960fa9.tar.xz nixpkgs-3ed1e3b2686728050cab55f6309910ec9e960fa9.tar.zst nixpkgs-3ed1e3b2686728050cab55f6309910ec9e960fa9.zip | |
pcb2gcode: fix build on darwin
This version bumps gerbv as well.
| -rw-r--r-- | pkgs/applications/science/electronics/gerbv/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/misc/pcb2gcode/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index f83cfa1bf04..0c45184e31c 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,13 +1,12 @@ -{ 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; }; } diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix index 146233b2e02..9079817d9eb 100644 --- a/pkgs/tools/misc/pcb2gcode/default.nix +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b50fe4dc0c..db0c6f59dfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37845,7 +37845,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 { }; |