diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-01-18 11:16:59 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-01-18 11:20:40 +0100 |
| commit | 07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd (patch) | |
| tree | b1908ec0ee47127678c413795b96b03e0de3842f /pkgs/tools/filesystems | |
| parent | c438ce12a858f24c1a2479213eaab751da45fa50 (diff) | |
| download | nixpkgs-07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd.tar nixpkgs-07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd.tar.gz nixpkgs-07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd.tar.bz2 nixpkgs-07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd.tar.lz nixpkgs-07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd.tar.xz nixpkgs-07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd.tar.zst nixpkgs-07b8ab4ff791dc8bcfeea643fd9a1fbedc534bbd.zip | |
python2.pkgs.nixpart0: use correct libselinux bindings
Sine 56e557257df675bc6b2cbebf3ba5bc6d51b2321c libselinux in pkgs defaults to Python 3 so let's use the one from python.pkgs to make sure it matches.
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index da2dff6b77a..003a0e24fb5 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock libselinux.py cryptsetup + pykickstart pyparted pyblock libselinux cryptsetup ] ++ stdenv.lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 129283e83eb..5d7a9dd14ec 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, python, buildPythonApplication +, libselinux # Propagated to blivet , useNixUdev ? true # Needed by NixOps @@ -10,10 +11,9 @@ let blivet = import ./blivet.nix { inherit stdenv fetchurl buildPythonApplication; - inherit pykickstart pyparted pyblock cryptsetup multipath_tools; + inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools; inherit useNixUdev; inherit (pkgs) lsof utillinux systemd; - libselinux = pkgs.libselinux.override { enablePython = true; }; }; cryptsetup = import ./cryptsetup.nix { |