diff options
| author | Will Dietz <github@wdtz.org> | 2018-04-03 13:20:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 13:20:09 -0500 |
| commit | 8422a14493e6bf87023dff54cc115646811ce233 (patch) | |
| tree | b23d19df3d76934eb9b4b74e26038459759d565e /pkgs | |
| parent | 97145012565cd4ef9c8c16a426c3ea505ad0ca52 (diff) | |
| parent | 990d29282fbc992eb60fdd68262e39deb3085127 (diff) | |
| download | nixlib-8422a14493e6bf87023dff54cc115646811ce233.tar nixlib-8422a14493e6bf87023dff54cc115646811ce233.tar.gz nixlib-8422a14493e6bf87023dff54cc115646811ce233.tar.bz2 nixlib-8422a14493e6bf87023dff54cc115646811ce233.tar.lz nixlib-8422a14493e6bf87023dff54cc115646811ce233.tar.xz nixlib-8422a14493e6bf87023dff54cc115646811ce233.tar.zst nixlib-8422a14493e6bf87023dff54cc115646811ce233.zip | |
Merge pull request #37810 from dtzWill/update/udisks2-2.1.8
udisks2: 2.1.6 -> 2.1.8, extend workaround to include musl
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/udisks/2-default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 725b1cd25643..1c8e429c9455 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -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 ]; |