diff options
author | Domen Kožar <domen@dev.si> | 2014-01-29 08:57:20 -0800 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2014-01-29 08:57:20 -0800 |
commit | aa595f3cf1bf546885be7e855a7ff927f57755e3 (patch) | |
tree | af460168c5425292686eb6082aa60bf5d6257d70 /pkgs/os-specific | |
parent | e18cd2f8ae67088c24d0d9484ab5531598ca473c (diff) | |
parent | c17e6d696882c3e639ec9cf9e25a9abc48317088 (diff) | |
download | nixpkgs-aa595f3cf1bf546885be7e855a7ff927f57755e3.tar nixpkgs-aa595f3cf1bf546885be7e855a7ff927f57755e3.tar.gz nixpkgs-aa595f3cf1bf546885be7e855a7ff927f57755e3.tar.bz2 nixpkgs-aa595f3cf1bf546885be7e855a7ff927f57755e3.tar.lz nixpkgs-aa595f3cf1bf546885be7e855a7ff927f57755e3.tar.xz nixpkgs-aa595f3cf1bf546885be7e855a7ff927f57755e3.tar.zst nixpkgs-aa595f3cf1bf546885be7e855a7ff927f57755e3.zip |
Merge pull request #1628 from tomberek/alienfx_libusb
Add #include <unisted.h> for sleep and usleep
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/alienfx/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/alienfx/unistd.patch | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix index 9924779d92a..93d77819e57 100644 --- a/pkgs/os-specific/linux/alienfx/default.nix +++ b/pkgs/os-specific/linux/alienfx/default.nix @@ -14,11 +14,12 @@ stdenv.mkDerivation { sha256 = "47501a3b4e08d39edee4cd829ae24259a7e740b9798db76b846fa872989f8fb1"; }; - patchPhase = '' + prePatch = '' substituteInPlace Makefile --replace /usr/ $out/ substituteInPlace Makefile --replace "install -o root -g root" "install" ''; + patches = [./unistd.patch]; buildInputs = [ libusb1 ]; makeFlags = "build"; preInstall = '' diff --git a/pkgs/os-specific/linux/alienfx/unistd.patch b/pkgs/os-specific/linux/alienfx/unistd.patch new file mode 100644 index 00000000000..546a27892f0 --- /dev/null +++ b/pkgs/os-specific/linux/alienfx/unistd.patch @@ -0,0 +1,12 @@ +diff --git a/alienfx.cpp b/alienfx.cpp +index 5981039..aea8992 100644 +--- a/alienfx.cpp ++++ b/alienfx.cpp +@@ -13,6 +13,7 @@ + #include <string.h> + #include <iostream> + #include <libusb-1.0/libusb.h> ++#include <unistd.h> + + using namespace std; + |