ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36694 from xeji/dislocker

Browse Source 
dislocker: 0.6.1 -> 0.7.1
This commit is contained in:
Franz Pletz 2018-03-12 23:20:18 +00:00 committed by GitHub
commit 6d6d93c8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 365903a..f126ade 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -149,7 +149,7 @@ if(NOT DEFINED bindir)
endif()
string (TOLOWER "${CMAKE_SYSTEM_NAME}" SYSNAME)
-set (DIS_MAN ../man/${SYSNAME})
+set (DIS_MAN ${PROJECT_SOURCE_DIR}/man/${SYSNAME})
# RPATH handling
if(POLICY CMP0042)

6
pkgs/tools/filesystems/dislocker/default.nix
View File

@ -4,7 +4,7 @@
}: }:
with stdenv.lib; with stdenv.lib;
let let
version = "0.6.1"; version = "0.7.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dislocker-${version}"; name = "dislocker-${version}";
@ -13,13 +13,11 @@ stdenv.mkDerivation rec {
owner = "aorimn"; owner = "aorimn";
repo = "dislocker"; repo = "dislocker";
rev = "v${version}"; rev = "v${version}";
sha256 = "1s2pvsf4jgzxk9d9m2ik7v7g81lvj8mhmhh7f53vwy0vmihf9h0d"; sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
}; };
buildInputs = [ cmake fuse polarssl ]; buildInputs = [ cmake fuse polarssl ];
patches = [ ./cmake_dirfix.patch ];
meta = { meta = {
description = "Read BitLocker encrypted partitions in Linux"; description = "Read BitLocker encrypted partitions in Linux";
homepage = https://github.com/aorimn/dislocker; homepage = https://github.com/aorimn/dislocker;