public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102983 from marsam/fix-nixops-darwin

Browse Source 
nixops: fix build on darwin
This commit is contained in:
Domen Kožar 2020-11-06 06:59:11 +01:00 committed by GitHub
commit 1d78dc8a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libvirt/5.9.0.nix
View File

@ -36,12 +36,12 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ]; nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ];
buildInputs = [ buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib libtirpc libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
] ++ optionals (!buildFromTarball) [ ] ++ optionals (!buildFromTarball) [
libtool autoconf automake libtool autoconf automake
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libpciaccess lvm2 utillinux systemd libnl numad zfs libpciaccess lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted libapparmor libcap_ng numactl attr parted libtirpc
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
xen xen
] ++ optionals enableIscsi [ ] ++ optionals enableIscsi [

9
pkgs/tools/package-management/nixops/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, fetchurl }: { callPackage, fetchurl, fetchpatch }:
callPackage ./generic.nix (rec { callPackage ./generic.nix (rec {
version = "1.7"; version = "1.7";
@ -6,4 +6,11 @@ callPackage ./generic.nix (rec {
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3";
}; };
patches = [
# follow redirect in nixos-infect. Remove with the next release.
(fetchpatch {
url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch";
sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0";
})
];
}) })

3
pkgs/tools/package-management/nixops/generic.nix
View File

@ -2,11 +2,12 @@
# version args # version args
, src, version , src, version
, meta ? {} , meta ? {}
, patches ? null
}: }:
python2Packages.buildPythonApplication { python2Packages.buildPythonApplication {
name = "nixops-${version}"; name = "nixops-${version}";
inherit version src; inherit version src patches;
buildInputs = [ libxslt ]; buildInputs = [ libxslt ];