diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-29 18:09:34 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-05-04 17:57:52 +0200 |
| commit | 8cc761c606a07c20546c803f4300bd626aeded9f (patch) | |
| tree | e2fdb456ed189399ad19ac500afb1677a0db5c23 /pkgs/tools/misc/getopt | |
| parent | 9955f6301ac1bad58350d09cee18ab6c16fdc628 (diff) | |
| download | nixpkgs-8cc761c606a07c20546c803f4300bd626aeded9f.tar nixpkgs-8cc761c606a07c20546c803f4300bd626aeded9f.tar.gz nixpkgs-8cc761c606a07c20546c803f4300bd626aeded9f.tar.bz2 nixpkgs-8cc761c606a07c20546c803f4300bd626aeded9f.tar.lz nixpkgs-8cc761c606a07c20546c803f4300bd626aeded9f.tar.xz nixpkgs-8cc761c606a07c20546c803f4300bd626aeded9f.tar.zst nixpkgs-8cc761c606a07c20546c803f4300bd626aeded9f.zip | |
getopt: 1.1.4 -> 1.1.6, modernize a bit
http://frodo.looijaard.name/project/getopt/release/1-1-6 http://frodo.looijaard.name/project/getopt/release/1-1-5 * don't rely on tarballs.nixos.org * no need for custom builder
Diffstat (limited to 'pkgs/tools/misc/getopt')
| -rw-r--r-- | pkgs/tools/misc/getopt/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/getopt/default.nix | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/tools/misc/getopt/builder.sh b/pkgs/tools/misc/getopt/builder.sh deleted file mode 100644 index a220ad0c66f..00000000000 --- a/pkgs/tools/misc/getopt/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup -installFlags="prefix=$out" -makeFlags="CFLAGS=-DWITHOUT_GETTEXT LIBCGETOPT=0" -genericBuild diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index 8221bec6cca..62414a60475 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -1,15 +1,19 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "getopt-1.1.4"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + pname = "getopt"; + version = "1.1.6"; src = fetchurl { - url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz; - sha256 = "1arvjfzw6p310zbgv629w5hkyslrj44imf3r3s2r4ry2jfcks221"; + url = "http://frodo.looijaard.name/system/files/software/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1zn5kp8ar853rin0ay2j3p17blxy16agpp8wi8wfg4x98b31vgyh"; }; - preBuild = '' - export buildFlags=CC="$CC" # for darwin - ''; + + makeFlags = [ + "WITHOUT_GETTEXT=1" + "LIBCGETOPT=0" + "prefix=${placeholder "out"}" + "CC:=$(CC)" + ]; meta = { platforms = stdenv.lib.platforms.unix; |