about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2017-06-21 18:54:10 -0500
committerWill Dietz <w@wdtz.org>2017-06-21 18:54:10 -0500
commita3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90 (patch)
tree1b92c56fc6c58b174a6d2c86e0f8e0831171aa58 /pkgs/tools
parente89e96a7551e4213f50e0f44467546a26d42ea5f (diff)
downloadnixlib-a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90.tar
nixlib-a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90.tar.gz
nixlib-a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90.tar.bz2
nixlib-a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90.tar.lz
nixlib-a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90.tar.xz
nixlib-a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90.tar.zst
nixlib-a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90.zip
upx: 3.93 -> 3.94
* Use release tarball
* Cleanup a bit
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/compression/upx/default.nix22
1 files changed, 6 insertions, 16 deletions
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index c41553b562d1..8c9f74330581 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -2,31 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "upx-${version}";
-  version = "3.93";
-  src = fetchFromGitHub {
-    owner = "upx";
-    repo = "upx";
-    rev = "v${version}";
-    sha256 = "03ah23q85hx3liqyyj4vm8vip2d47bijsimagqd39q762a2rin3i";
+  version = "3.94";
+  src = fetchurl {
+    url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz";
+    sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1";
   };
 
   buildInputs = [ ucl zlib perl ];
 
-  lzmaSrc = fetchFromGitHub {
-    owner = "upx";
-    repo = "upx-lzma-sdk";
-    rev = "v${version}";
-    sha256 = "16vj1c5bl04pzma0sr4saqk80y2iklyslzmrb4rm66aifa365zqj";
-  };
-
   preConfigure = "
     export UPX_UCLDIR=${ucl}
-    cp -a $lzmaSrc/* src/lzma-sdk
-    export UPX_LZMADIR=`pwd`/src/lzma-sdk
     cd src
   ";
 
-  buildPhase = "make CHECK_WHITESPACE=true";
+  makeFlags = [ "CHECK_WHITESPACE=true" ];
+
   installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx";
 
   meta = {