public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14371 from pmahoney/skarnet

Browse Source 
Update skarnet.org packages
This commit is contained in:
Peter Simons
2016-04-01 17:59:14 +02:00
parent 0805920132 fc1f5d2cf1
commit 90d0b08237
8 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/skalibs/default.nix
View File

@@ -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/;