diff options
| author | Bodil Stokke <bodil@bodil.org> | 2013-08-12 19:41:37 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2013-08-18 18:23:35 +0200 |
| commit | de462dcae2306eb943a0de78d0de7e9505ea16f5 (patch) | |
| tree | f3654a08672416d72d1495e2411cff15a0846c64 /pkgs/tools/misc | |
| parent | d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc (diff) | |
| download | nixpkgs-de462dcae2306eb943a0de78d0de7e9505ea16f5.tar nixpkgs-de462dcae2306eb943a0de78d0de7e9505ea16f5.tar.gz nixpkgs-de462dcae2306eb943a0de78d0de7e9505ea16f5.tar.bz2 nixpkgs-de462dcae2306eb943a0de78d0de7e9505ea16f5.tar.lz nixpkgs-de462dcae2306eb943a0de78d0de7e9505ea16f5.tar.xz nixpkgs-de462dcae2306eb943a0de78d0de7e9505ea16f5.tar.zst nixpkgs-de462dcae2306eb943a0de78d0de7e9505ea16f5.zip | |
Cleaned up ponysay build, and added maintainer metadata.
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/ponysay/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/tools/misc/ponysay/pathfix.patch | 24 |
2 files changed, 10 insertions, 31 deletions
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 1f281a71301..17be93dda8f 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -10,21 +10,24 @@ stdenv.mkDerivation rec { buildInputs = [ python3 texinfo makeWrapper ]; - phases = "unpackPhase patchPhase installPhase"; + inherit python3; - patches = [ ./pathfix.patch ]; + phases = "unpackPhase installPhase fixupPhase"; installPhase = '' - python3 setup.py --prefix=$out --freedom=partial install --with-shared-cache=$out/share/ponysay - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" - done + find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g" + substituteInPlace setup.py --replace \ + "fileout.write(('#!/usr/bin/env %s\n' % env).encode('utf-8'))" \ + "fileout.write(('#!%s/bin/%s\n' % (os.environ['python3'], env)).encode('utf-8'))" + python3 setup.py --prefix=$out --freedom=partial install \ + --with-shared-cache=$out/share/ponysay \ + --with-bash ''; meta = { description = "cowsay reimplemention for ponies."; homepage = http://terse.tk/ponysay/; license = "GPLv3"; + maintainers = with stdenv.lib.maintainers; [ bodil ]; }; } diff --git a/pkgs/tools/misc/ponysay/pathfix.patch b/pkgs/tools/misc/ponysay/pathfix.patch deleted file mode 100644 index ad50f653024..00000000000 --- a/pkgs/tools/misc/ponysay/pathfix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN ponysay-3.0.1/setup.py ponysay.p/setup.py ---- ponysay-3.0.1/setup.py 2013-04-05 14:28:18.000000000 +0200 -+++ ponysay.p/setup.py 2013-08-10 01:09:30.181043877 +0200 -@@ -514,7 +514,7 @@ - for command in commands: - sourceed = 'completion/ponysay.%s' % (command) - generated = 'completion/%s-completion.%s' % (shell, command) -- generatorcmd = './completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed) -+ generatorcmd = 'python3 completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed) - Popen(generatorcmd.split(' ')).communicate() - if conf[command] is not None: - dest = generated + '.install' -@@ -559,9 +559,9 @@ - for toolcommand in ('--dimensions', '--metadata'): - if not self.free: - print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir)) -- Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() -+ Popen(['python3', './src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() - else: -- params = ['./src/ponysaytool.py', toolcommand, sharedir, '--'] -+ params = ['python3', './src/ponysaytool.py', toolcommand, sharedir, '--'] - for sharefile in os.listdir(sharedir): - if sharefile.endswith('.pony') and (sharefile != '.pony'): - if not Setup.validateFreedom(sharedir + '/' + sharefile): |