Unverified Commit 34d8d08f authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #259361 from doronbehar/pkg/transmission 

transmission_4: fix darwin build
parents 51bc5df8 f5cd0b91

pkgs/applications/networking/p2p/transmission/4.nix

+5 −7
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
, dht

, libnatpmp

, libiconv

, darwin

, Foundation

  # Build options

, enableGTK3 ? false

, gtkmm3
@@ -37,14 +37,14 @@ 
, apparmorRulesFromClosure

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "transmission";

  version = "4.0.4";



  src = fetchFromGitHub {

    owner = "transmission";

    repo = "transmission";

    rev = version;

    rev = finalAttrs.version;

    hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw=";

    fetchSubmodules = true;

  };
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec { 
  ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ]

  ++ lib.optionals enableSystemd [ systemd ]

  ++ lib.optionals stdenv.isLinux [ inotify-tools ]

  ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Foundation ];

  ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ];



  postInstall = ''

    mkdir $apparmor
@@ -164,7 +164,5 @@ stdenv.mkDerivation rec { 
    license = with lib.licenses; [ gpl2Plus mit ];

    maintainers = with lib.maintainers; [ astsmtl ];

    platforms = lib.platforms.unix;

    # Needs macOS >= 10.14.6

    broken = stdenv.isDarwin && stdenv.isx86_64;

  };

}
 
})

pkgs/applications/networking/p2p/transmission/default.nix

+4 −7
Original line number Diff line number Diff line
@@ -32,17 +32,14 @@ 
, apparmorRulesFromClosure

}:



let

  version = "3.00";



in stdenv.mkDerivation {

stdenv.mkDerivation (finalAttrs: {

  pname = "transmission";

  inherit version;

  version = "3.00";



  src = fetchFromGitHub {

    owner = "transmission";

    repo = "transmission";

    rev = version;

    rev = finalAttrs.version;

    sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z";

    fetchSubmodules = true;

  };
@@ -147,4 +144,4 @@ in stdenv.mkDerivation { 
    platforms = lib.platforms.unix;

  };



}
 
})

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -36119,7 +36119,9 @@ with pkgs; 
  transmission-gtk = transmission.override { enableGTK3 = true; };

  transmission-qt = transmission.override { enableQt = true; };













  transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix {













  # Needs macOS >= 10.14.6













  transmission_4 = darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix {













    inherit (darwin.apple_sdk_11_0.frameworks) Foundation;















    fmt = fmt_9;















    libutp = libutp_3_4;















  };