diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-15 23:10:08 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-15 23:10:08 +0200 |
| commit | a415d5dd2ec2f8daa339ba74f3563e220e8af803 (patch) | |
| tree | 40ba5f9e0c985fe85e91eba02e95e85e460466d3 /pkgs/tools/compression | |
| parent | 5957e9f06466f898cfc1ea4b1611a7b559e103a9 (diff) | |
| parent | 2a42aa90298cba13d302605d00d4331b134ace98 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/ncompress/builder.sh | 15 | ||||
| -rw-r--r-- | pkgs/tools/compression/ncompress/default.nix | 25 |
2 files changed, 16 insertions, 24 deletions
diff --git a/pkgs/tools/compression/ncompress/builder.sh b/pkgs/tools/compression/ncompress/builder.sh deleted file mode 100644 index 7a3f34aae469..000000000000 --- a/pkgs/tools/compression/ncompress/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup -installFlags="PREFIX=$out" - -preBuild() { - cp Makefile.def Makefile - sed -i GNUmakefile -e 's/compress %/%/g' -} - -postInstall() { - rm $out/bin/uncompress* $out/bin/zcat* - ln -s compress $out/bin/uncompress - ln -s compress $out/bin/zcat -} - -genericBuild diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index f580709495ed..c4678cd96021 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,20 +1,27 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ncompress"; version = "5.0"; - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://sourceforge/project/ncompress/${pname}-${version}.tar.gz"; - sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4"; + src = fetchFromGitHub { + owner = "vapier"; + repo = "ncompress"; + rev = "v${version}"; + sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0="; }; - meta = { + makeFlags = [ "PREFIX=$(out)" ]; + installTargets = "install_core"; + + postInstall = '' + mv $out/bin/uncompress $out/bin/uncompress-ncompress + ''; + + meta = with lib; { homepage = "http://ncompress.sourceforge.net/"; - license = lib.licenses.publicDomain; + license = licenses.publicDomain; description = "A fast, simple LZW file compressor"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } |