diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:45:39 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:56:01 +0000 |
commit | eb7dadee9c0f903f1152f8dd4165453bfa48ccf4 (patch) | |
tree | a6bd66dcbec895aae167465672af08a1ca70f089 /nixpkgs/pkgs/development/mobile | |
parent | 3879b925f5dae3a0eb5c98b10c1ac5a0e4d729a3 (diff) | |
parent | 683c68232e91f76386db979c461d8fbe2a018782 (diff) | |
download | nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.gz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.bz2 nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.lz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.xz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.zst nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.zip |
Merge commit '683c68232e91f76386db979c461d8fbe2a018782'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile')
-rw-r--r-- | nixpkgs/pkgs/development/mobile/webos/novacomd.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/mobile/xpwn/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix index 4d62dd305d3a..932ec0e59d64 100644 --- a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix +++ b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, webos, cmake, pkgconfig, -libusb }: +libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "novacomd"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; diff --git a/nixpkgs/pkgs/development/mobile/xpwn/default.nix b/nixpkgs/pkgs/development/mobile/xpwn/default.nix index 9ec5977d5947..0c49a29b3222 100644 --- a/nixpkgs/pkgs/development/mobile/xpwn/default.nix +++ b/nixpkgs/pkgs/development/mobile/xpwn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }: +{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }: stdenv.mkDerivation rec { pname = "xpwn"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libpng bzip2 libusb openssl ]; + buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; meta = with stdenv.lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; |