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

Merge pull request #35287 from volth/patch-93 

libguestfs: 1.36.3 -> 1.38.0
This commit is contained in:
Franz Pletz 2018-02-23 04:34:05 +00:00 committed by GitHub
parent 8afcfb2bb6 f3b899d3a6
commit 0b6143bfb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libguestfs/default.nix
View File

@ -9,16 +9,16 @@ assert javaSupport -> jdk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libguestfs-${version}"; name = "libguestfs-${version}";
version = "1.36.3"; version = "1.38.0";
appliance = fetchurl { appliance = fetchurl {
url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz"; url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125"; sha256 = "05481qxgidakga871yb5rgpyci2jaxmplmkh6y79anfh5m19nzhy";
}; };
src = fetchurl { src = fetchurl {
url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz"; url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
# some scripts hardcore /usr/bin/env which is not available in the build env # some scripts hardcore /usr/bin/env which is not available in the build env
patchShebangs . patchShebangs .
''; '';
configureFlags = [ "--disable-appliance" "--disable-daemon" ] configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ]
++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
patches = [ ./libguestfs-syms.patch ]; patches = [ ./libguestfs-syms.patch ];
NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";