diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
| commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
| tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/tools/archivers | |
| parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
| parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
| download | nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.gz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.bz2 nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.lz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.xz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.zst nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.zip | |
Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/runzip/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 8 |
2 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix new file mode 100644 index 000000000000..9b2fd0eda594 --- /dev/null +++ b/pkgs/tools/archivers/runzip/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchFromGitHub, libzip, autoconf, automake, libtool, m4}: +stdenv.mkDerivation rec { + baseName = "runzip"; + version = "1.4"; + name = "${baseName}-${version}"; + buildInputs = [libzip autoconf automake libtool m4]; + src = fetchFromGitHub { + owner = "vlm"; + repo = "zip-fix-filename-encoding"; + rev = "v${version}"; + sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07"; + }; + preConfigure = '' + autoreconf -iv + ''; + meta = { + inherit version; + description = ''A tool to convert filename encoding inside a ZIP archive''; + license = stdenv.lib.licenses.bsd2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index e4da0236cdfe..585bc72ad967 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -13,11 +13,9 @@ stdenv.mkDerivation { sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; - # should be makeFlags on all archs, not changed yet to prevent rebuild - buildFlags="-f unix/Makefile generic"; - makeFlags = if stdenv.isCygwin then "-f unix/Makefile ${if stdenv.isCygwin then "cygwin" else "generic"}" else null; - - installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; + makefile = "unix/Makefile"; + buildFlags = if stdenv.isCygwin then "cygwin" else "generic"; + installFlags = "prefix=$(out) INSTALL=cp"; patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; |