diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-07-15 02:37:11 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-07-15 03:31:54 +0200 |
| commit | da9b997233e42db4e15fcb7381b06a1b22ab906d (patch) | |
| tree | 6744f5a988103bcb70b7dab873ee3adb411aeffc | |
| parent | 94c94926f563c31e814e08b908f0382f2d6f7cad (diff) | |
| download | nixpkgs-da9b997233e42db4e15fcb7381b06a1b22ab906d.tar nixpkgs-da9b997233e42db4e15fcb7381b06a1b22ab906d.tar.gz nixpkgs-da9b997233e42db4e15fcb7381b06a1b22ab906d.tar.bz2 nixpkgs-da9b997233e42db4e15fcb7381b06a1b22ab906d.tar.lz nixpkgs-da9b997233e42db4e15fcb7381b06a1b22ab906d.tar.xz nixpkgs-da9b997233e42db4e15fcb7381b06a1b22ab906d.tar.zst nixpkgs-da9b997233e42db4e15fcb7381b06a1b22ab906d.zip | |
libkeyfinder 0.11 -> 2.1
| -rw-r--r-- | pkgs/development/libraries/libkeyfinder/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index f0e75b34059..12c360b3263 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, boost, fftw, qt5 }: +{ stdenv, fetchFromGitHub, fftw, qt5 }: -let version = "0.11"; in +let version = "2.1"; in stdenv.mkDerivation { name = "libkeyfinder-${version}"; src = fetchFromGitHub { - sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9"; + sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7"; rev = "v${version}"; repo = "libKeyFinder"; owner = "ibsh"; @@ -21,10 +21,11 @@ stdenv.mkDerivation { }; buildInputs = [ fftw qt5.base ]; - propagatedBuildInputs = [ boost ]; - patchPhase = '' - substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out" + postPatch = '' + substituteInPlace LibKeyFinder.pro \ + --replace "/usr/local" "$out" \ + --replace "-stdlib=libc++" "" ''; configurePhase = '' @@ -35,6 +36,8 @@ stdenv.mkDerivation { postInstall = '' mkdir -p $out/include/keyfinder - cp *.h $out/include/keyfinder + install -m644 *.h $out/include/keyfinder + mkdir -p $out/lib + cp -a lib*.so* $out/lib ''; } |