diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
commit | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (patch) | |
tree | 4a4ee79a6e0694d3c7ad6fbeff33343d83458e6c /pkgs/development/mobile/xpwn/default.nix | |
parent | a2538606e3115e16db2e5075ecf37b886ad64ede (diff) | |
parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
download | nixpkgs-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar nixpkgs-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.gz nixpkgs-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.bz2 nixpkgs-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.lz nixpkgs-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.xz nixpkgs-5061fe0c2c7743370e1d379d6fa60eed26ff1470.tar.zst nixpkgs-5061fe0c2c7743370e1d379d6fa60eed26ff1470.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/mobile/xpwn/default.nix')
-rw-r--r-- | pkgs/development/mobile/xpwn/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index d62902e4f6e..9ec5977d594 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb, openssl }: +{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }: -stdenv.mkDerivation { - name = "xpwn-0.5.8git"; +stdenv.mkDerivation rec { + pname = "xpwn"; + version = "0.5.8git"; - src = fetchgit { - url = "git://github.com/dborca/xpwn.git"; - rev = "4534da88d4e8a32cdc9da9b5326e2cc482c95ef0"; - sha256 = "1h1ak40fg5bym0hifpii9q2hqdp2m387cwfzb4bl6qq36xpkd6wv"; + src = fetchFromGitHub { + owner = "planetbeing"; + repo = pname; + rev = "ac362d4ffe4d0489a26144a1483ebf3b431da899"; + sha256 = "1qw9vbk463fpnvvvfgzxmn9add2p30k832s09mlycr7z1hrh3wyf"; }; preConfigure = '' @@ -18,7 +20,9 @@ stdenv.mkDerivation { sed -i -e '/install/d' CMakeLists.txt ''; - buildInputs = [ cmake zlib libpng bzip2 libusb openssl ]; + strictDeps = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libpng bzip2 libusb openssl ]; meta = with stdenv.lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; |