ploticus: 2.41 → 2.42

https://github.com/NixOS/nixpkgs/commit/65f1e8e048db75be3e97048fecb99ed39b0ce2e5 bumped the version but forgot to update the tarball URL.

Unfortunately, this version does not seem to ship makefiles.

+12 -15
+3 -7
pkgs/tools/graphics/ploticus/default.nix
··· 6 6 , libpng 7 7 }: 8 8 9 - stdenv.mkDerivation { 9 + stdenv.mkDerivation rec { 10 10 pname = "ploticus"; 11 11 version = "2.42"; 12 12 13 13 src = fetchurl { 14 - url = "mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz"; 15 - sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c"; 14 + url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz"; 15 + sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; 16 16 }; 17 17 18 18 patches = [ ··· 46 46 mkdir -p "$out/share/ploticus/prefabs" 47 47 cp -rv prefabs/* "$out/share/ploticus/prefabs" 48 48 49 - # Install the man pages. 50 - cp -rv man $out/share 51 - 52 49 # Add aliases for backwards compatibility. 53 - ln -s "pl.1" "$out/share/man/man1/ploticus.1" 54 50 ln -s "pl" "$out/bin/ploticus" 55 51 ''; 56 52
+9 -8
pkgs/tools/graphics/ploticus/set-prefabs-dir.patch
··· 1 - --- a/src/Makefile 2 - +++ b/src/Makefile 3 - @@ -133,6 +133,6 @@ 4 - #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. 5 - #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined. 6 - #### This option not available for win32 7 - -# PREFABS_DIR = "/usr/lib/ploticus/prefabs" 8 - +PREFABS_DIR = "$(out)/share/ploticus/prefabs" 1 + --- a/src/pl.h 2 + +++ b/src/pl.h 3 + @@ -8,7 +8,7 @@ 4 + #include <stdlib.h> 5 + #include "plg.h" 6 + 7 + -#define PREFABS_DIR "" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */ 8 + +#define PREFABS_DIR "@out@/share/ploticus/prefabs" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */ 9 9 10 + #define PLVERSION "2.42-May2013" /* see also the Copyright page, and page headers and footers */ 10 11