From 1f4940368ae5ce2bd61dcb1474c11e6803334987 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 15 Feb 2017 20:48:40 -0500 Subject: [PATCH] bins: fix permissions issue regenerating albums since the template files in the nix store are read-only, they can't be overwritten the second time the album is generated. using cp's '-f' option works around this. --- pkgs/tools/graphics/bins/cp-dash-f.patch | 11 +++++++++++ pkgs/tools/graphics/bins/default.nix | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/graphics/bins/cp-dash-f.patch 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 00000000000..e280e5349c1 --- /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 d41df87fb6d..b43e99c42a1 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;