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

Merge pull request #37810 from dtzWill/update/udisks2-2.1.8

Browse Source 
udisks2: 2.1.6 -> 2.1.8, extend workaround to include musl
This commit is contained in:
Will Dietz 2018-04-03 13:20:09 -05:00 committed by GitHub
commit 8422a14493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/udisks/2-default.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "udisks-2.1.6";
name = "udisks-2.1.8";
src = fetchurl {
url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
sha256 = "1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs";
};
outputs = [ "out" "man" "dev" ];
@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
--replace "/bin/sh" "${stdenv.shell}" \
--replace "/sbin/mdadm" "${mdadm}/bin/mdadm" \
--replace " sed " " ${gnused}/bin/sed "
'';
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace udisks/udisksclient.c \
--replace 'defined( __GNUC_PREREQ)' 1 \
--replace '__GNUC_PREREQ(4,6)' 1
'';
nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];