From 003b24ac4566785201b9516b3c842ffdb2c1c5d4 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 14 Mar 2012 21:57:43 +0000
Subject: [PATCH] Trying to fix k3d build
svn path=/nixpkgs/trunk/; revision=33089
---
pkgs/applications/graphics/k3d/debian-patches.nix | 14 ++++++++++++++
pkgs/applications/graphics/k3d/debian-patches.txt | 3 +++
pkgs/applications/graphics/k3d/default.nix | 6 +-----
3 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644 pkgs/applications/graphics/k3d/debian-patches.nix
create mode 100644 pkgs/applications/graphics/k3d/debian-patches.txt
diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix
new file mode 100644
index 00000000000..fe1289f1441
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/debian-patches.nix
@@ -0,0 +1,14 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+ prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15";
+in
+[
+ {
+ url = "${prefix}/disable_mutable_in_boost_gil.patch";
+ sha256 = "037l86h2hszqgw8arqpzprz5qvngsb61i7lpww617mkvqrc4hiq3";
+ }
+ {
+ url = "${prefix}/k3d_gtkmm224.patch";
+ sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
+ }
+]
diff --git a/pkgs/applications/graphics/k3d/debian-patches.txt b/pkgs/applications/graphics/k3d/debian-patches.txt
new file mode 100644
index 00000000000..a9b4abed2f0
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/debian-patches.txt
@@ -0,0 +1,3 @@
+k3d/0.8.0.2-15
+disable_mutable_in_boost_gil.patch
+k3d_gtkmm224.patch
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index db6288f4cf1..b9cec29b1f2 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -12,11 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
};
- patches = [ (fetchurl {
- url = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15/k3d_gtkmm224.patch";
- sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
- })
- ];
+ patches = map fetchurl (import ./debian-patches.nix);
preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"