about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/tools/graphics/bins/cp-dash-f.patch11
-rw-r--r--pkgs/tools/graphics/bins/default.nix3
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/bins/cp-dash-f.patch b/pkgs/tools/graphics/bins/cp-dash-f.patch
new file mode 100644
index 000000000000..e280e5349c1f
--- /dev/null
+++ b/pkgs/tools/graphics/bins/cp-dash-f.patch
@@ -0,0 +1,11 @@
+--- a/bins	2016-05-18 20:45:49.513330005 -0400
++++ b/bins	2016-05-18 20:58:58.957830874 -0400
+@@ -1332,7 +1332,7 @@
+                 mkdir $destDir, 0755
+                     or die("\nCannot create $destDir: $?");
+             }
+-            system("cp", "-R", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
++            system("cp", "-Rf", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
+                 or die("\nCannot copy $staticDir directory content to $destDir: $?");
+         } else {
+             beVerboseN("  Cannot find any static template directory.", 4);
diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix
index d41df87fb6d9..b43e99c42a14 100644
--- a/pkgs/tools/graphics/bins/default.nix
+++ b/pkgs/tools/graphics/bins/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
                                      DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui
 
   patches = [ ./bins_edit-isa.patch
-              ./hashref.patch ];
+              ./hashref.patch
+              ./cp-dash-f.patch ];
 
   installPhase = ''
     export DESTDIR=$out;