diff options
author | Graham Christensen <graham@grahamc.com> | 2019-01-14 08:37:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-14 08:37:16 -0500 |
commit | 202bee9391593f8e9a1668428e1a72d0f659023b (patch) | |
tree | 12806fdbd44d78ca3f0d3729b17db4bb6300c21d | |
parent | d1e05f6eed30671da9f46741cc1004ff037938a8 (diff) | |
parent | 2922ae9ee74f3b3d2499ab87e35139db45f1ecc6 (diff) | |
download | nixlib-202bee9391593f8e9a1668428e1a72d0f659023b.tar nixlib-202bee9391593f8e9a1668428e1a72d0f659023b.tar.gz nixlib-202bee9391593f8e9a1668428e1a72d0f659023b.tar.bz2 nixlib-202bee9391593f8e9a1668428e1a72d0f659023b.tar.lz nixlib-202bee9391593f8e9a1668428e1a72d0f659023b.tar.xz nixlib-202bee9391593f8e9a1668428e1a72d0f659023b.tar.zst nixlib-202bee9391593f8e9a1668428e1a72d0f659023b.zip |
Merge pull request #53147 from tilpner/abduco-update
abduco: 0.6 -> 2018-05-16
-rw-r--r-- | pkgs/tools/misc/abduco/default.nix | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 4fc254b76b40..8545d86427a4 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,29 +1,27 @@ -{ stdenv, fetchurl, writeText, conf? null}: +{ stdenv, fetchFromGitHub, writeText, conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.6"; + name = "abduco-2018-05-16"; - meta = { - homepage = http://brain-dump.org/projects/abduco; - license = licenses.isc; - description = "Allows programs to be run independently from its controlling terminal"; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; - }; + src = fetchFromGitHub { + owner = "martanne"; + repo = "abduco"; + rev = "8f80aa8044d7ecf0e43a0294a09007d056b20e4c"; + sha256 = "0wqcif633nbgnznn46j0sng9l0wncppw1x1c42f75b4p9hrph203"; + }; - CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - src = fetchurl { - url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "1x1m58ckwsprljgmdy93mvgjyg9x3cqrzdf3mysp0mx97zhhj2f9"; - }; + CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - - installPhase = '' - make PREFIX=$out install - ''; + meta = { + homepage = http://brain-dump.org/projects/abduco; + license = licenses.isc; + description = "Allows programs to be run independently from its controlling terminal"; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; + }; } |