about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-29 19:34:20 -0600
committerGitHub <noreply@github.com>2018-11-29 19:34:20 -0600
commitf435272ce351ed192e9ff9c643331a4cc063930e (patch)
tree09d2cd01d0062578f61c4712fb73ab6b29313b45 /pkgs/top-level
parent1cd300e57b35b5e075a56ba9bea348f209620191 (diff)
parent9c8fd412248ad907eee7547b19bf3f7583d2c411 (diff)
downloadnixlib-f435272ce351ed192e9ff9c643331a4cc063930e.tar
nixlib-f435272ce351ed192e9ff9c643331a4cc063930e.tar.gz
nixlib-f435272ce351ed192e9ff9c643331a4cc063930e.tar.bz2
nixlib-f435272ce351ed192e9ff9c643331a4cc063930e.tar.lz
nixlib-f435272ce351ed192e9ff9c643331a4cc063930e.tar.xz
nixlib-f435272ce351ed192e9ff9c643331a4cc063930e.tar.zst
nixlib-f435272ce351ed192e9ff9c643331a4cc063930e.zip
Merge pull request #50212 from matthewbauer/host-emulator
Add "emulator" function to systems
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/release-lib.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 522eb613f1ba..267039c37a77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12533,7 +12533,7 @@ with pkgs;
   taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
 
   talloc = callPackage ../development/libraries/talloc {
-    python = python2;
+    python = buildPackages.python2;
   };
 
   tclap = callPackage ../development/libraries/tclap {};
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 957de2dcc307..7e7cac95b9c5 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -54,7 +54,7 @@ rec {
   # More poor man's memoisation
   pkgsForCross = let
     examplesByConfig = lib.flip lib.mapAttrs'
-      (builtins.removeAttrs lib.systems.examples [ "riscv" ])
+      lib.systems.examples
       (_: crossSystem: nameValuePair crossSystem.config {
         inherit crossSystem;
         pkgsFor = mkPkgsFor crossSystem;