diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-11-29 16:50:26 +0100 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-11-29 16:50:26 +0100 |
| commit | 920b1d3591431837f4522ccff52fb65b241200cf (patch) | |
| tree | a63a1acebbee20444f4b3e9e2695ec712ba7aae3 /pkgs/os-specific/linux/udisks | |
| parent | 07a0204282224891492e7e1cfe72830a1fc32355 (diff) | |
| parent | a9056371a0a62da46ff88183a6535635ed085dec (diff) | |
| download | nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.gz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.bz2 nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.lz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.xz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.zst nixlib-920b1d3591431837f4522ccff52fb65b241200cf.zip | |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/os-specific/linux/udisks')
| -rw-r--r-- | pkgs/os-specific/linux/udisks/1-default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udisks/glibc.patch | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index a0596abb2695..98cb616e2d5c 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; - patches = [ ./purity.patch ./no-pci-db.patch ]; + patches = [ ./purity.patch ./no-pci-db.patch ./glibc.patch ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/udisks/glibc.patch b/pkgs/os-specific/linux/udisks/glibc.patch new file mode 100644 index 000000000000..85ef5208049d --- /dev/null +++ b/pkgs/os-specific/linux/udisks/glibc.patch @@ -0,0 +1,25 @@ +From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Fri, 29 May 2015 21:09:39 -0400 +Subject: [PATCH] Bug 90778 - fix build with newer glibc versions + +https://bugs.freedesktop.org/show_bug.cgi?id=90778 +--- + src/helpers/job-drive-detach.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c +index eeafcab..d122a1f 100644 +--- a/src/helpers/job-drive-detach.c ++++ b/src/helpers/job-drive-detach.c +@@ -18,6 +18,7 @@ + * + */ + ++#include <sys/stat.h> + #include <stdio.h> + #include <string.h> + #include <errno.h> +-- +2.4.2 + |