diff options
| author | xeji <xeji@cat3.de> | 2018-03-09 22:06:58 +0100 |
|---|---|---|
| committer | xeji <xeji@cat3.de> | 2018-03-09 22:35:28 +0100 |
| commit | 2d7043155378e9a2bf5a2540bd0d2091251c64cb (patch) | |
| tree | 08039fe3a338e4de26927a7c7aac09aa87570e05 | |
| parent | 43be4ebfb15b57b36e30ba390a73315ea3890087 (diff) | |
| download | nixpkgs-2d7043155378e9a2bf5a2540bd0d2091251c64cb.tar nixpkgs-2d7043155378e9a2bf5a2540bd0d2091251c64cb.tar.gz nixpkgs-2d7043155378e9a2bf5a2540bd0d2091251c64cb.tar.bz2 nixpkgs-2d7043155378e9a2bf5a2540bd0d2091251c64cb.tar.lz nixpkgs-2d7043155378e9a2bf5a2540bd0d2091251c64cb.tar.xz nixpkgs-2d7043155378e9a2bf5a2540bd0d2091251c64cb.tar.zst nixpkgs-2d7043155378e9a2bf5a2540bd0d2091251c64cb.zip | |
dislocker: 0.6.1 -> 0.7.1
| -rw-r--r-- | pkgs/tools/filesystems/dislocker/cmake_dirfix.patch | 13 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/dislocker/default.nix | 6 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch b/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch deleted file mode 100644 index 829666bfe7a..00000000000 --- a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch +++ /dev/null @@ -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) diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index 57676e7a89a..2e4ea88df7f 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -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; |