diff options
| author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
|---|---|---|
| committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
| commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
| tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/os-specific/linux/cryptsetup | |
| parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
| download | nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip | |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
Diffstat (limited to 'pkgs/os-specific/linux/cryptsetup')
| -rw-r--r-- | pkgs/os-specific/linux/cryptsetup/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e1da0a449c5..a09fa93cb78 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt +{ stdenv, fetchurl, fetchpatch, lvm2, json_c +, openssl, libuuid, pkgconfig, popt , enablePython ? false, python2 ? null }: assert enablePython -> python2 != null; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper json_c openssl libuuid popt ] + buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; meta = { |