diff options
author | Will Dietz <github@wdtz.org> | 2018-04-26 09:49:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-26 09:49:16 -0500 |
commit | 5e1603f1fde4c2b77ec3f1c560fde30c735efb81 (patch) | |
tree | ac9afd20080940c38d8694920c0e6eb4ac70c8e8 | |
parent | 6e623fb07b6d0642b10f878148dea14ad8ff4d74 (diff) | |
parent | 38ef327aec2d59e484438c36851c0c3ac930ca7a (diff) | |
download | nixlib-5e1603f1fde4c2b77ec3f1c560fde30c735efb81.tar nixlib-5e1603f1fde4c2b77ec3f1c560fde30c735efb81.tar.gz nixlib-5e1603f1fde4c2b77ec3f1c560fde30c735efb81.tar.bz2 nixlib-5e1603f1fde4c2b77ec3f1c560fde30c735efb81.tar.lz nixlib-5e1603f1fde4c2b77ec3f1c560fde30c735efb81.tar.xz nixlib-5e1603f1fde4c2b77ec3f1c560fde30c735efb81.tar.zst nixlib-5e1603f1fde4c2b77ec3f1c560fde30c735efb81.zip |
Merge pull request #39556 from dtzWill/fix/procps-ng-version
procps-ng: Use official release tarballs, fix version.
-rw-r--r-- | pkgs/os-specific/linux/procps-ng/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index d164af63315f..08420e36c65b 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,22 +1,17 @@ -{ lib, stdenv, fetchurl, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: +{ lib, stdenv, fetchurl, ncurses, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; version = "3.3.14"; + # The project's releases are on SF, but git repo on gitlab. src = fetchurl { - url = "https://gitlab.com/procps-ng/procps/-/archive/v${version}/procps-v${version}.tar.bz2"; - sha256 = "0igvsl3s7m5ygxgypzksk4cp2wkvv3lk49s7i9m5wbimyakmr0vf"; + url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; + sha256 = "0v3j6rkzzscqds37i105cxx3q4dk04rsgpqfd5p7hzcvk59h5njy"; }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ]; - - # autoreconfHook doesn't quite get, what procps-ng buildprocss does - # with po/Makefile.in.in and stuff. - preConfigure = '' - ./autogen.sh - ''; + nativeBuildInputs = [ pkgconfig ]; makeFlags = "usrbin_execdir=$(out)/bin"; |