diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/tools/archivers | |
parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
download | nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/innoextract/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/zpaq/default.nix | 43 |
3 files changed, 25 insertions, 26 deletions
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 6b442e7bf66..1f27730b19a 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, python, doxygen, lzma, boost}: stdenv.mkDerivation rec { - name = "innoextract-1.5"; + name = "innoextract-1.6"; src = fetchurl { url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; - sha256 = "1ks8z8glak63xvqlv7dnmlzkjrwsn81lhybmai2mja6g5jclwngj"; + sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6"; }; buildInputs = [ python doxygen lzma boost ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 769f20c4111..f2fdc71dc86 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p"; }; + postPatch = '' + sed 's/^CXX=g++/#CXX/' -i makefile + ''; + buildPhase = '' make unrar make clean diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 2b761df3863..011793248cd 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,23 +1,14 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, perl, unzip }: let s = # Generated upstream information rec { baseName="zpaq"; - version="705"; + version="707"; name="${baseName}-${version}"; - hash="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; - url="http://mattmahoney.net/dc/zpaq705.zip"; - sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; + hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; + url="http://mattmahoney.net/dc/zpaq707.zip"; + sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; }; - isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; - isx86 = stdenv.isi686 || stdenv.isx86_64; - compileFlags = with stdenv; "" - + (lib.optionalString (isUnix) " -Dunix -pthread") - + (lib.optionalString (isi686) " -march=i686") - + (lib.optionalString (isx86_64) " -march=nocona") - + (lib.optionalString (!isx86) " -DNOJIT") - + " -O3 -mtune=generic -DNDEBUG" - ; in stdenv.mkDerivation { inherit (s) name version; @@ -28,20 +19,24 @@ stdenv.mkDerivation { sourceRoot = "."; + nativeBuildInputs = [ perl /* for pod2man */ ]; buildInputs = [ unzip ]; - buildPhase = '' - g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so - g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq + preBuild = let + CPPFLAGS = with stdenv; "" + + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + + "-Dunix"; + CXXFLAGS = with stdenv; "" + + (lib.optionalString (isi686) "-march=i686 ") + + (lib.optionalString (isx86_64) "-march=nocona ") + + "-O3 -mtune=generic -DNDEBUG"; + in '' + buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; - installPhase = '' - mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} - cp libzpaq.so "$out/lib" - cp zpaq "$out/bin" - cp libzpaq.h "$out/include" - cp readme.txt "$out/share/doc/zpaq" - ''; + enableParallelBuilding = true; + + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { inherit (s) version; |