summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2019-03-18 12:49:29 -0500
committerGitHub <noreply@github.com>2019-03-18 12:49:29 -0500
commit7785df3b907f2a662a12bb800ee6ef5a19fb9a1b (patch)
tree327739965eed303af5ee641b4c82a69ef64f19b0 /pkgs/os-specific
parent3ff71fcc8b3dc1d17a823bd7f52b7685b4f5b1e1 (diff)
parentd3760f1c7a8de5c4f2c9e268cefc4ca06e834307 (diff)
downloadnixpkgs-7785df3b907f2a662a12bb800ee6ef5a19fb9a1b.tar
nixpkgs-7785df3b907f2a662a12bb800ee6ef5a19fb9a1b.tar.gz
nixpkgs-7785df3b907f2a662a12bb800ee6ef5a19fb9a1b.tar.bz2
nixpkgs-7785df3b907f2a662a12bb800ee6ef5a19fb9a1b.tar.lz
nixpkgs-7785df3b907f2a662a12bb800ee6ef5a19fb9a1b.tar.xz
nixpkgs-7785df3b907f2a662a12bb800ee6ef5a19fb9a1b.tar.zst
nixpkgs-7785df3b907f2a662a12bb800ee6ef5a19fb9a1b.zip
Merge pull request #57495 from r-ryantm/auto-update/udisks
udisks: 2.8.1 -> 2.8.2
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/udisks/2-default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index e0340a0b784..484697d42ea 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/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"