xbill: fix build (#422103)

authored by Aleksana and committed by GitHub e1645b6c 67e38442

+29 -5
+7
maintainers/maintainer-list.nix
··· 12330 githubId = 31407988; 12331 name = "Jon Bosque"; 12332 }; 12333 jonnybolton = { 12334 email = "jonnybolton@gmail.com"; 12335 github = "jonnynightingale";
··· 12330 githubId = 31407988; 12331 name = "Jon Bosque"; 12332 }; 12333 + jonhermansen = { 12334 + name = "Jon Hermansen"; 12335 + email = "jon@jh86.org"; 12336 + matrix = "@jonhermansen:matrix.org"; 12337 + github = "jonhermansen"; 12338 + githubId = 660911; 12339 + }; 12340 jonnybolton = { 12341 email = "jonnybolton@gmail.com"; 12342 github = "jonnynightingale";
+22 -5
pkgs/by-name/xb/xbill/package.nix
··· 1 { 2 stdenv, 3 lib, 4 makeDesktopItem, 5 copyDesktopItems, 6 fetchurl, 7 libX11, 8 libXpm, 9 libXt, 10 motif, 11 - ... 12 }: 13 14 stdenv.mkDerivation rec { 15 pname = "xbill"; 16 version = "2.1"; 17 18 - nativeBuildInputs = [ copyDesktopItems ]; 19 buildInputs = [ 20 libX11 21 libXpm ··· 32 33 src = fetchurl { 34 url = "http://www.xbill.org/download/${pname}-${version}.tar.gz"; 35 - sha256 = "13b08lli2gvppmvyhy0xs8cbjbkvrn4b87302mx0pxrdrvqzzz8f"; 36 }; 37 38 desktopItems = [ 39 (makeDesktopItem { 40 name = "xbill"; ··· 53 install -Dm644 pixmaps/icon.xpm $out/share/pixmaps/xbill.xpm 54 ''; 55 56 - meta = with stdenv; { 57 description = "Protect a computer network from getting infected"; 58 homepage = "http://www.xbill.org/"; 59 license = lib.licenses.gpl1Only; 60 - maintainers = with lib.maintainers; [ aw ]; 61 longDescription = '' 62 Ever get the feeling that nothing is going right? You're a sysadmin, 63 and someone's trying to destroy your computers. The little people ··· 66 operating system. 67 ''; 68 mainProgram = "xbill"; 69 }; 70 }
··· 1 { 2 stdenv, 3 lib, 4 + autoreconfHook, 5 makeDesktopItem, 6 copyDesktopItems, 7 + fetchpatch, 8 fetchurl, 9 libX11, 10 libXpm, 11 libXt, 12 motif, 13 }: 14 15 stdenv.mkDerivation rec { 16 pname = "xbill"; 17 version = "2.1"; 18 19 + nativeBuildInputs = [ 20 + autoreconfHook # Fix configure script that fails basic compilation check 21 + copyDesktopItems 22 + ]; 23 + 24 buildInputs = [ 25 libX11 26 libXpm ··· 37 38 src = fetchurl { 39 url = "http://www.xbill.org/download/${pname}-${version}.tar.gz"; 40 + hash = "sha256-Dv3/8c4t9wt6FWActIjNey65GNIdeOh3vXc/ESlFYI0="; 41 }; 42 43 + # xbill requires strcasecmp and strncasecmp but is missing proper includes 44 + patches = [ 45 + (fetchpatch { 46 + url = "https://raw.githubusercontent.com/gentoo/gentoo/7c2c329a5a80781a9aaca24221675a0db66fd244/games-arcade/xbill/files/xbill-2.1-clang16.patch"; 47 + hash = "sha256-Eg8qbSOdUoENcYruH6hSVIHcORkJeP8FXvp09cj/IXA="; 48 + }) 49 + ]; 50 + 51 desktopItems = [ 52 (makeDesktopItem { 53 name = "xbill"; ··· 66 install -Dm644 pixmaps/icon.xpm $out/share/pixmaps/xbill.xpm 67 ''; 68 69 + meta = { 70 description = "Protect a computer network from getting infected"; 71 homepage = "http://www.xbill.org/"; 72 license = lib.licenses.gpl1Only; 73 + maintainers = with lib.maintainers; [ 74 + aw 75 + jonhermansen 76 + ]; 77 longDescription = '' 78 Ever get the feeling that nothing is going right? You're a sysadmin, 79 and someone's trying to destroy your computers. The little people ··· 82 operating system. 83 ''; 84 mainProgram = "xbill"; 85 + platforms = lib.platforms.unix; 86 }; 87 }