diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-22 23:34:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-04-13 17:34:23 +0000 |
commit | 41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e (patch) | |
tree | 28aa38e222bc0ace9be6440cd66255b65690fb88 /nixpkgs/pkgs/os-specific/linux/udisks | |
parent | 9b7e3c15392a628ca748f9452016e4a6b02fe98f (diff) | |
parent | 373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c (diff) | |
download | nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.gz nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.bz2 nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.lz nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.xz nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.zst nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.zip |
Merge commit '373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/udisks')
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix b/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix index e0340a0b7849..484697d42ea9 100644 --- a/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix +++ b/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, intltool, gnused -, gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash +{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, gettext, gnused +, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted -, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43 +, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake , xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g }: let - version = "2.8.1"; + version = "2.8.2"; in stdenv.mkDerivation rec { name = "udisks-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "udisks"; rev = name; - sha256 = "073iqa0pwa7ab0qw33h3ic89508a78incmg6rq914d6br7s030zy"; + sha256 = "000xf99id1f6w8l20jxm3f2g32v9wx68rzv6q2bwrfz6vmy76xwy"; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gnome3.gnome-common libtool intltool gobject-introspection + autoconf automake pkgconfig libtool gettext which gobject-introspection gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { expat libgudev libblockdev acl systemd glib libatasmart polkit ]; - preConfigure = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--enable-gtk-doc" |