Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5d3e36cabace
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0511b88ccb8d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 21, 2019

  1. xpwn: bump to commit including openssl 1.1 support

    @globin
    globin committed Aug 21, 2019
    Copy the full SHA
    0511b88 View commit details
Showing with 12 additions and 8 deletions.
  1. +12 −8 pkgs/development/mobile/xpwn/default.nix
20 changes: 12 additions & 8 deletions pkgs/development/mobile/xpwn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";