diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-07-23 20:42:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 20:42:48 +0200 |
| commit | 06d1723c4e520d84be69a30b36e6d7c909e0fcf3 (patch) | |
| tree | 3b1bf2b30c00944c3923c18e28f056a33663ef9c /pkgs/applications/misc | |
| parent | 3b317b16dfeb0aca287be446b2644038e8375ea9 (diff) | |
| parent | cf08d94d1887849ee170bc13d87ae3e292a4fb1b (diff) | |
| download | nixlib-06d1723c4e520d84be69a30b36e6d7c909e0fcf3.tar nixlib-06d1723c4e520d84be69a30b36e6d7c909e0fcf3.tar.gz nixlib-06d1723c4e520d84be69a30b36e6d7c909e0fcf3.tar.bz2 nixlib-06d1723c4e520d84be69a30b36e6d7c909e0fcf3.tar.lz nixlib-06d1723c4e520d84be69a30b36e6d7c909e0fcf3.tar.xz nixlib-06d1723c4e520d84be69a30b36e6d7c909e0fcf3.tar.zst nixlib-06d1723c4e520d84be69a30b36e6d7c909e0fcf3.zip | |
Merge pull request #17195 from womfoo/bump/pwsafe-0.99
pwsafe: fix build and 0.95 -> 0.99
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/pwsafe/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 3faf127d88db..f65435ba7b23 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, wxGTK, libuuid, xercesc, zip , libXt, libXtst +{ stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst , libXi, xextproto, gettext, perl, pkgconfig, libyubikey, ykpers }: stdenv.mkDerivation rec { name = "pwsafe-${version}"; - version = "0.95"; + version = "0.99"; - src = fetchurl { - url = "mirror://sourceforge/passwordsafe/pwsafe-${version}BETA-src.tgz"; - sha256 = "f0b081bc358fee97fce20f352e360960d2813989023b837102b90ba6ed787d46"; + src = fetchFromGitHub { + owner = "pwsafe"; + repo = "pwsafe"; + rev = "${version}BETA"; + sha256 = "1bkimz4g9v9kfjkqr3dqddh4jps7anzc1hgmirmmhwpac0xdp60g"; }; makefile = "Makefile.linux"; @@ -30,6 +32,9 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace /usr/share/ $out/share/ done + # Fix hard coded zip path. + substituteInPlace help/Makefile.linux --replace /usr/bin/zip ${zip}/bin/zip + for f in `grep -Rl /usr/bin/ .`; do substituteInPlace $f --replace /usr/bin/ "" done @@ -45,7 +50,7 @@ stdenv.mkDerivation rec { $out/share/locale (cd help && make -f Makefile.linux) - cp help/help.zip $out/share/doc/passwordsafe/help + cp help/help*.zip $out/share/doc/passwordsafe/help (cd src/ui/wxWidgets/I18N && make mos) cp -dr src/ui/wxWidgets/I18N/mos/* $out/share/locale/ |