From 45216b82a121276bc5568a555af6132519a96541 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 28 Feb 2015 17:49:58 +0100 Subject: [PATCH 1/2] lirc: upgraded to 0.9.2a --- pkgs/development/libraries/lirc/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 278eb8e9e523..b9b810ca92c0 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3 }: stdenv.mkDerivation rec { - name = "lirc-0.9.1a"; + name = "lirc-0.9.2a"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "191vhgsds221rzpzjibj005pfr182hq65hniqfd0qqsl5h1zwq8r"; + sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim"; }; - patches = [ - (fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lirc-0.9.1a-fix-segfaults.patch?h=packages/lirc"; - sha256 = "00ainq7y8yh2r447968jid06cqfb1xirv24xxrkl0gvakrrv9gnh"; - }) - ]; - preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man ]; + buildInputs = [ alsaLib help2man pkgconfig x11 python3 ]; configureFlags = [ "--with-driver=devinput" From 186348f83127c6db3abab2ab70dcd0a1de3002ef Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 28 Feb 2015 20:30:04 +0100 Subject: [PATCH 2/2] lirc: fix python reference in build tools --- pkgs/development/libraries/lirc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index b9b810ca92c0..d84e0219294d 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim"; }; + patchPhase = '' + sed -e 's|^#!/usr/bin/env python3$|#!${python3}/bin/python3|g' -i tools/*.py + ''; + preBuild = "patchShebangs ."; buildInputs = [ alsaLib help2man pkgconfig x11 python3 ];