diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-09 07:13:03 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-09 07:13:03 +0000 |
| commit | 1f84acc1133d93e8dc1ab4fec73f54263da88884 (patch) | |
| tree | c02bd88e73c488e0d1e22b1fe7a6810e0d70d63a /pkgs/development/libraries/gamin | |
| parent | 7331031c0c0e7fb14df6067d07f70e3b150d13e8 (diff) | |
| download | nixpkgs-1f84acc1133d93e8dc1ab4fec73f54263da88884.tar nixpkgs-1f84acc1133d93e8dc1ab4fec73f54263da88884.tar.gz nixpkgs-1f84acc1133d93e8dc1ab4fec73f54263da88884.tar.bz2 nixpkgs-1f84acc1133d93e8dc1ab4fec73f54263da88884.tar.lz nixpkgs-1f84acc1133d93e8dc1ab4fec73f54263da88884.tar.xz nixpkgs-1f84acc1133d93e8dc1ab4fec73f54263da88884.tar.zst nixpkgs-1f84acc1133d93e8dc1ab4fec73f54263da88884.zip | |
gamin: glib-2.30.0 FTBFS
Cherry-pick ^/nixpkgs/branches/glib-2.30@31417 svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32943
Diffstat (limited to 'pkgs/development/libraries/gamin')
| -rw-r--r-- | pkgs/development/libraries/gamin/debian-patches.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/gamin/debian-patches.txt | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gamin/default.nix | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix new file mode 100644 index 00000000000..1da558db141 --- /dev/null +++ b/pkgs/development/libraries/gamin/debian-patches.nix @@ -0,0 +1,10 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4"; +in +[ + { + url = "${prefix}/17_deprecated_const_return.patch"; + sha256 = "0bssrqcmyivlpk2g0q71d1yavd4wv1lw34l8qipm0ndljjd6rbrk"; + } +] diff --git a/pkgs/development/libraries/gamin/debian-patches.txt b/pkgs/development/libraries/gamin/debian-patches.txt new file mode 100644 index 00000000000..4faad71d44d --- /dev/null +++ b/pkgs/development/libraries/gamin/debian-patches.txt @@ -0,0 +1,2 @@ +gamin/0.1.10-4 +17_deprecated_const_return.patch diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index c72a619b66e..a212946c67f 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -8,9 +8,13 @@ stdenv.mkDerivation rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - buildInputs = [ python pkgconfig glib ]; + buildNativeInputs = [ pkgconfig ]; + + buildInputs = [ python glib ]; # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # <sys/socket.h> with Glibc 2.9. configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; + + patches = map fetchurl (import ./debian-patches.nix); } |