diff options
| author | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-25 16:32:42 +0800 |
|---|---|---|
| committer | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-25 16:32:42 +0800 |
| commit | 5c7cfbc0f11e360f50467b20a407c675c976d3a0 (patch) | |
| tree | 7aa06d0070426e8ce9aeb61218e50fc27a2bb94d /pkgs/development/libraries/libossp-uuid | |
| parent | b619e0b016c5c79920aa06b78ccf936e56eaf45d (diff) | |
| download | nixpkgs-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar nixpkgs-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.gz nixpkgs-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.bz2 nixpkgs-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.lz nixpkgs-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.xz nixpkgs-5c7cfbc0f11e360f50467b20a407c675c976d3a0.tar.zst nixpkgs-5c7cfbc0f11e360f50467b20a407c675c976d3a0.zip | |
allow postgresql cross compiling
Diffstat (limited to 'pkgs/development/libraries/libossp-uuid')
| -rw-r--r-- | pkgs/development/libraries/libossp-uuid/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/libossp-uuid/shtool.patch | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index ddfc2a5132c..4cd68f2f1b5 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, buildPackages}: let version = "1.6.2"; in @@ -12,6 +12,12 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + patches = [ ./shtool.patch ]; + + preConfigure = '' + export ac_cv_va_copy=yes + ''; + meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; description = "OSSP uuid ISO-C and C++ shared library"; diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/development/libraries/libossp-uuid/shtool.patch new file mode 100644 index 00000000000..f0c7cc485f5 --- /dev/null +++ b/pkgs/development/libraries/libossp-uuid/shtool.patch @@ -0,0 +1,11 @@ +--- a/shtool 2008-07-05 05:43:08.000000000 +0800 ++++ b/shtool 2018-07-25 15:45:40.559587471 +0800 +@@ -1400,7 +1400,7 @@ + if [ ".$opt_t" = .yes ]; then + echo "strip $dsttmp" 1>&2 + fi +- strip $dsttmp || shtool_exit $? ++ $STRIP $dsttmp || shtool_exit $? + fi + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then |