diff options
author | Peter Simons <simons@cryp.to> | 2016-04-01 17:59:14 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2016-04-01 17:59:14 +0200 |
commit | 90d0b082374023c98cefba137efe7e232846d24d (patch) | |
tree | 9558b547b27a6e2ec913fc48bba3f669edbcc7c7 /pkgs/development | |
parent | 0805920132e7c7c4fba3f168296481f6a71b4fe6 (diff) | |
parent | fc1f5d2cf1a4febaa7843284554fd7397c8988bc (diff) | |
download | nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.gz nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.bz2 nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.lz nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.xz nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.zst nixlib-90d0b082374023c98cefba137efe7e232846d24d.zip |
Merge pull request #14371 from pmahoney/skarnet
Update skarnet.org packages
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/skalibs/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index e8b3403df405..349e5582013f 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.7.0"; + version = "2.3.9.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "11k84vckwvxphjswqxv677p6riyb2hgx1kh15f865hnk8n21fldx"; + sha256 = "1c5ap14f2yr3izz8s1blgp5g4r898kzppay7xrga2j216i51zfpw"; }; dontDisableStatic = true; @@ -23,7 +23,14 @@ in stdenv.mkDerivation rec { "--libdir=\${prefix}/lib" "--includedir=\${prefix}/include" "--sysdepdir=\${prefix}/lib/skalibs/sysdeps" - ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + # On darwin, the target triplet from -dumpmachine includes version number, but + # skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/skalibs/; |