forked from mirrors/nixpkgs
Merge pull request #36694 from xeji/dislocker
dislocker: 0.6.1 -> 0.7.1
This commit is contained in:
commit
6d6d93c8de
|
@ -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)
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
with stdenv.lib;
|
||||
let
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dislocker-${version}";
|
||||
|
@ -13,13 +13,11 @@ stdenv.mkDerivation rec {
|
|||
owner = "aorimn";
|
||||
repo = "dislocker";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s2pvsf4jgzxk9d9m2ik7v7g81lvj8mhmhh7f53vwy0vmihf9h0d";
|
||||
sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake fuse polarssl ];
|
||||
|
||||
patches = [ ./cmake_dirfix.patch ];
|
||||
|
||||
meta = {
|
||||
description = "Read BitLocker encrypted partitions in Linux";
|
||||
homepage = https://github.com/aorimn/dislocker;
|
||||
|
|
Loading…
Reference in a new issue