commit 458a408142f0399e985a62b2efc7247bb4a79985

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #146579 from flurie/fix-libvirt-aarch64-darwin

libvirt: fix build on aarch64-darwin

authored by

Robert Hensing and committed by

GitHub 4 years ago 458a4081 91ec4e28

+7 -1

2 changed files

expand all

unified split

pkgs

development

libraries

libvirt

default.nix

top-level

all-packages.nix

pkgs/development/libraries/libvirt/default.nix

··· 60 , ceph 61 , enableGlusterfs ? false 62 , glusterfs 63 }: 64 65 with lib; ··· 152 ] ++ optionals stdenv.isDarwin [ 153 libiconv 154 gmp 155 ]; 156 157 preConfigure =

··· 60 , ceph 61 , enableGlusterfs ? false 62 , glusterfs 63 + , Carbon 64 + , AppKit 65 }: 66 67 with lib; ··· 154 ] ++ optionals stdenv.isDarwin [ 155 libiconv 156 gmp 157 + Carbon 158 + AppKit 159 ]; 160 161 preConfigure =

+3 -1

pkgs/top-level/all-packages.nix

··· 18363 18364 libversion = callPackage ../development/libraries/libversion { }; 18365 18366 - libvirt = callPackage ../development/libraries/libvirt { }; 18367 libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { }; 18368 18369 libvirt-glib = callPackage ../development/libraries/libvirt-glib { };

··· 18363 18364 libversion = callPackage ../development/libraries/libversion { }; 18365 18366 + libvirt = callPackage ../development/libraries/libvirt { 18367 + inherit (darwin.apple_sdk.frameworks) Carbon AppKit; 18368 + }; 18369 libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { }; 18370 18371 libvirt-glib = callPackage ../development/libraries/libvirt-glib { };