diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/lirc/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/libraries/nss/default.nix | 6 |
2 files changed, 28 insertions, 14 deletions
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 960c8cc24949..7f4d8cc19c8e 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,31 +1,45 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3 +, libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { - name = "lirc-0.9.4"; + name = "lirc-0.10.1"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6"; + sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; - preBuild = "patchShebangs ."; + postPatch = '' + patchShebangs . + + # fix overriding PYTHONPATH + sed -i 's,^PYTHONPATH *= *,PYTHONPATH := $(PYTHONPATH):,' \ + Makefile.in + sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \ + doc/Makefile.in + ''; + + preConfigure = '' + # use empty inc file instead of a from linux kernel generated one + touch lib/lirc/input_map.inc + ''; nativeBuildInputs = [ pkgconfig help2man ]; - buildInputs = [ alsaLib xlibsWrapper python3 libxslt ]; + buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ] + ++ (with python3.pkgs; [ python pyyaml setuptools ]); configureFlags = [ - "--with-driver=devinput" "--sysconfdir=/etc" "--localstatedir=/var" - "--enable-sandboxed" + "--with-systemdsystemunitdir=$(out)/lib/systemd/system" + "--enable-uinput" # explicite activation because build env has no uinput + "--enable-devinput" # explicite activation because build env has not /dev/input ]; - makeFlags = [ "m4dir=$(out)/m4" ]; - installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + "sysconfdir=$out/etc" + "localstatedir=$TMPDIR" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 47f5c1ef5cf9..8d799e2c13a0 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.33"; + version = "3.34.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_33_RTM/src/${name}.tar.gz"; - sha256 = "1r44qa4j7sri50mxxbnrpm6fxprwrhv76whi7bfq73j06syxmw4q"; + url = "mirror://mozilla/security/nss/releases/NSS_3_34_1_RTM/src/${name}.tar.gz"; + sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3"; }; buildInputs = [ perl zlib sqlite ]; |