public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python2.pkgs.nixpart0: use correct libselinux bindings

Browse Source 
Sine 56e557257df675bc6b2cbebf3ba5bc6d51b2321c libselinux in pkgs defaults to Python 3 so let's use the one from python.pkgs to make sure it matches.
This commit is contained in:
Jan Tojnar 2020-01-18 11:16:59 +01:00
parent c438ce12a8
commit 07b8ab4ff7
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/filesystems/nixpart/0.4/blivet.nix
View File

@ -35,7 +35,7 @@ buildPythonApplication rec {
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
pykickstart pyparted pyblock libselinux.py cryptsetup pykickstart pyparted pyblock libselinux cryptsetup
] ++ stdenv.lib.optional useNixUdev systemd; ] ++ stdenv.lib.optional useNixUdev systemd;
# tests are currently _heavily_ broken upstream # tests are currently _heavily_ broken upstream

4
pkgs/tools/filesystems/nixpart/0.4/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, python, buildPythonApplication { stdenv, fetchurl, python, buildPythonApplication
, libselinux
# Propagated to blivet # Propagated to blivet
, useNixUdev ? true , useNixUdev ? true
# Needed by NixOps # Needed by NixOps
@ -10,10 +11,9 @@
let let
blivet = import ./blivet.nix { blivet = import ./blivet.nix {
inherit stdenv fetchurl buildPythonApplication; inherit stdenv fetchurl buildPythonApplication;
inherit pykickstart pyparted pyblock cryptsetup multipath_tools; inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
inherit useNixUdev; inherit useNixUdev;
inherit (pkgs) lsof utillinux systemd; inherit (pkgs) lsof utillinux systemd;
libselinux = pkgs.libselinux.override { enablePython = true; };
}; };
cryptsetup = import ./cryptsetup.nix { cryptsetup = import ./cryptsetup.nix {