mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

gusb: 0.3.5 -> 0.3.7

Browse source
This commit is contained in:
Maxine Aubrey 2021-08-11 16:47:09 +02:00
parent 911b8a569c
commit 22f7e0839e
No known key found for this signature in database
GPG key ID: F6FE033DFCB899F7
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/gusb/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection
{ lib, stdenv, fetchurl, substituteAll, meson, ninja, pkg-config, gettext, gobject-introspection
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3
, glib, systemd, libusb1, vala, hwdata
}:
@ -10,15 +10,22 @@ let
in
stdenv.mkDerivation rec {
pname = "gusb";
version = "0.3.5";
version = "0.3.7";
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv";
sha256 = "sha256-2l8l1oc2ImibM1FIbL4CjvwlRAP2Rt2BIl3+hULYxn0=";
};
patches = [
(substituteAll {
src = ./fix-python-path.patch;
python = "${pythonEnv}/bin/python3";
})
];
nativeBuildInputs = [
meson ninja pkg-config gettext pythonEnv
gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44

14
pkgs/development/libraries/gusb/fix-python-path.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/gusb/meson.build b/gusb/meson.build
index 8236a2b..282aa48 100644
--- a/gusb/meson.build
+++ b/gusb/meson.build
@@ -147,7 +147,7 @@ libgusb_gir = libgusb_girtarget[0]
libgusb_typelib = libgusb_girtarget[1]
pymod = import('python')
-py_installation = pymod.find_installation()
+py_installation = pymod.find_installation('@python@')
# Verify the map file is correct -- note we can't actually use the generated
# file for two reasons: