summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2018-11-07 19:15:43 +0100
committerDaiderd Jordan <daiderd@gmail.com>2018-11-07 19:15:43 +0100
commitee1c6f62f842837bc4c723bd799f892c557c0789 (patch)
tree14387310750c8d78d9b88bf10cdf2aee3afb5122
parent16a54d6b2bb9dccb72cf8457719fdaff75352b3b (diff)
downloadnixpkgs-ee1c6f62f842837bc4c723bd799f892c557c0789.tar
nixpkgs-ee1c6f62f842837bc4c723bd799f892c557c0789.tar.gz
nixpkgs-ee1c6f62f842837bc4c723bd799f892c557c0789.tar.bz2
nixpkgs-ee1c6f62f842837bc4c723bd799f892c557c0789.tar.lz
nixpkgs-ee1c6f62f842837bc4c723bd799f892c557c0789.tar.xz
nixpkgs-ee1c6f62f842837bc4c723bd799f892c557c0789.tar.zst
nixpkgs-ee1c6f62f842837bc4c723bd799f892c557c0789.zip
darwin.trash: add cf-private
    Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in trash-571f39.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in trash-571f39.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in trash-571f39.o
          objc-class-ref in HGCLIUtils-31f3b3.o
    ld: symbol(s) not found for architecture x86_64
-rw-r--r--pkgs/os-specific/darwin/trash/default.nix11
-rw-r--r--pkgs/top-level/darwin-packages.nix2
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index 7f327fcf3d7..e1606383c0d 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, frameworks, perl } :
+{ stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }:
+
 stdenv.mkDerivation rec {
   version = "0.9.1";
   name = "trash-${version}";
@@ -10,11 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41";
   };
 
-  buildInputs = with frameworks; [
-    Cocoa
-    AppKit
-    ScriptingBridge
+  buildInputs = [
     perl
+    Cocoa AppKit ScriptingBridge
+    # Neded for OBJC_CLASS_$_NSMutableArray symbols.
+    cf-private
   ];
 
   patches = [ ./trash.diff ];
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 78ca0d20908..b52afe98f7f 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -66,7 +66,7 @@ in
 
   stubs = callPackages ../os-specific/darwin/stubs { };
 
-  trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; };
+  trash = darwin.callPackage ../os-specific/darwin/trash { };
 
   usr-include = callPackage ../os-specific/darwin/usr-include { };