diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-12-30 16:27:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-30 16:27:24 +0100 |
| commit | 9bc8e546c9ff38ece6f178a88055e19d16f872c9 (patch) | |
| tree | 66d35f295c263bb11e915785debd2ed0e504521b /pkgs/top-level | |
| parent | c94e211a478e6dc696ea66103edef32c67045ecc (diff) | |
| parent | 480fc1856a41800cde7f0b154f9bb0c3f8c4e27a (diff) | |
Merge pull request #75929 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abbb02329e787..d88da5d2a98be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3307,6 +3307,7 @@ in fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + python = python3; }); fontforge-gtk = fontforge.override { withSpiro = true; @@ -11204,7 +11205,6 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; - inherit (pythonPackages) gst-python; }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -16633,9 +16633,13 @@ in keyutils = callPackage ../os-specific/linux/keyutils { }; - libselinux = callPackage ../os-specific/linux/libselinux { }; + libselinux = callPackage ../os-specific/linux/libselinux { + python = python3; + }; - libsemanage = callPackage ../os-specific/linux/libsemanage { }; + libsemanage = callPackage ../os-specific/linux/libsemanage { + python = python3; + }; libraw = callPackage ../development/libraries/libraw { }; @@ -25178,11 +25182,7 @@ in seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; - selinux-python = callPackage ../os-specific/linux/selinux-python { - # needs python3 bindings - libselinux = libselinux.override { python = python3; }; - libsemanage = libsemanage.override { python = python3; }; - }; + selinux-python = callPackage ../os-specific/linux/selinux-python { }; slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; |