Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bupstash, httm, rustpython: unbreak on x86_64-darwin #209065

Closed
wants to merge 4 commits into from
Closed

bupstash, httm, rustpython: unbreak on x86_64-darwin #209065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98a10c0
darwin.apple_sdk_11_0: inherit stdenv in rustPlatform
wegank Jan 4, 2023
d496dff
rustpython: unbreak on x86_64-darwin
wegank Jan 4, 2023
79aaeb6
bupstash: unbreak on x86_64-darwin
wegank Jan 4, 2023
6c32b62
httm: fix build on x86_64-darwin
wegank Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ in {
inherit passthruFun;
};

rustpython = callPackage ./rustpython/default.nix {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
rustpython = darwin.apple_sdk_11_0.callPackage ./rustpython/default.nix {
inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration;
};

})
9 changes: 0 additions & 9 deletions pkgs/development/interpreters/python/rustpython/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://rustpython.github.io";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];

# TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions.
# Probably macOS SDK 10.13 or later. Check the current version in
# .../os-specific/darwin/apple-sdk/default.nix
#
# From the build logs:
#
# > Undefined symbols for architecture x86_64: "_utimensat"
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}
4 changes: 4 additions & 0 deletions pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ let
apple_sdk = prev.darwin.apple_sdk_11_0;
CF = prev.darwin.apple_sdk_11_0.CoreFoundation;
});
rustPlatform = pkgs.makeRustPlatform {
inherit (pkgs) rustc cargo;
inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
};
xcbuild = xcodebuild;
});

Expand Down
4 changes: 0 additions & 4 deletions pkgs/tools/backup/bupstash/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://bupstash.io";
license = licenses.mit;
platforms = platforms.unix;
# = note: Undefined symbols for architecture x86_64:
# "_utimensat", referenced from:
# https://github.com/NixOS/nixpkgs/issues/101229
broken = (stdenv.isDarwin && stdenv.isx86_64);
maintainers = with maintainers; [ andrewchambers ];
};
}
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,7 @@ with pkgs;

headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };

httm = callPackage ../tools/filesystems/httm { };
httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };

inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;

Expand Down Expand Up @@ -5731,7 +5731,7 @@ with pkgs;

bup = callPackage ../tools/backup/bup { };

bupstash = callPackage ../tools/backup/bupstash { };
bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { };

burp = callPackage ../tools/backup/burp { };

Expand Down