diff options
| author | Damien Cassou <damien@cassou.me> | 2016-04-03 10:31:52 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2016-06-06 13:59:31 +0200 |
| commit | 9afd1161e715a7966a1f29bf6626e505ef2a7f2b (patch) | |
| tree | 1ef8986332963739d29e8d285ff9a649254e20a3 /pkgs/applications/graphics | |
| parent | e148cf2bcacd10fb257610c006eef3d88c1f3286 (diff) | |
| download | nixpkgs-9afd1161e715a7966a1f29bf6626e505ef2a7f2b.tar nixpkgs-9afd1161e715a7966a1f29bf6626e505ef2a7f2b.tar.gz nixpkgs-9afd1161e715a7966a1f29bf6626e505ef2a7f2b.tar.bz2 nixpkgs-9afd1161e715a7966a1f29bf6626e505ef2a7f2b.tar.lz nixpkgs-9afd1161e715a7966a1f29bf6626e505ef2a7f2b.tar.xz nixpkgs-9afd1161e715a7966a1f29bf6626e505ef2a7f2b.tar.zst nixpkgs-9afd1161e715a7966a1f29bf6626e505ef2a7f2b.zip | |
inkscape: fix due to glibmm update
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 3704ea2f9c4..e009676f2f1 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d"; }; + patches = [ ./deprecated-scopedptr.patch ]; + postPatch = '' patchShebangs share/extensions '' diff --git a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch b/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch new file mode 100644 index 00000000000..94ae901394f --- /dev/null +++ b/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch @@ -0,0 +1,16 @@ +glibmm deprecated ScopedPtr +--- +diff -u src/ui/clipboard.cpp src/ui/clipboard.cpp +--- a/src/ui/clipboard.cpp 2015-01-28 04:32:28.162676000 +0100 ++++ b/src/ui/clipboard.cpp 2016-04-03 09:13:12.360980533 +0200 +@@ -1402,7 +1402,7 @@ + + Glib::ustring target; + if (atom_name) { +- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*. ++ target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*. + } + + listTargets.push_back(target); + +Diff finished. Sun Apr 3 09:13:51 2016 |