diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2017-02-15 20:48:40 -0500 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-21 06:37:07 +0100 |
| commit | 1f4940368ae5ce2bd61dcb1474c11e6803334987 (patch) | |
| tree | 5245663ec8db7632eecf7593c25040dd3fb6ed63 /pkgs/tools/graphics/bins | |
| parent | 05c2c131824633e7e9b3006223750034856dff72 (diff) | |
| download | nixlib-1f4940368ae5ce2bd61dcb1474c11e6803334987.tar nixlib-1f4940368ae5ce2bd61dcb1474c11e6803334987.tar.gz nixlib-1f4940368ae5ce2bd61dcb1474c11e6803334987.tar.bz2 nixlib-1f4940368ae5ce2bd61dcb1474c11e6803334987.tar.lz nixlib-1f4940368ae5ce2bd61dcb1474c11e6803334987.tar.xz nixlib-1f4940368ae5ce2bd61dcb1474c11e6803334987.tar.zst nixlib-1f4940368ae5ce2bd61dcb1474c11e6803334987.zip | |
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.
Diffstat (limited to 'pkgs/tools/graphics/bins')
| -rw-r--r-- | pkgs/tools/graphics/bins/cp-dash-f.patch | 11 | ||||
| -rw-r--r-- | pkgs/tools/graphics/bins/default.nix | 3 |
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; |