diff options
| author | Doron Behar <doron.behar@gmail.com> | 2023-10-07 11:07:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-07 11:07:40 +0300 |
| commit | 34d8d08fdd2bfa089dc670a6f3e5f0d645370925 (patch) | |
| tree | 255c3875c9033c3d4f33553bb0b5e1a4903e655f /pkgs/applications/networking/p2p | |
| parent | 51bc5df898f4fa77bad1f36835801d65e91b9813 (diff) | |
| parent | f5cd0b91dc43dd5096ef1d46104535870ffd70fa (diff) | |
| download | nixpkgs-34d8d08fdd2bfa089dc670a6f3e5f0d645370925.tar nixpkgs-34d8d08fdd2bfa089dc670a6f3e5f0d645370925.tar.gz nixpkgs-34d8d08fdd2bfa089dc670a6f3e5f0d645370925.tar.bz2 nixpkgs-34d8d08fdd2bfa089dc670a6f3e5f0d645370925.tar.lz nixpkgs-34d8d08fdd2bfa089dc670a6f3e5f0d645370925.tar.xz nixpkgs-34d8d08fdd2bfa089dc670a6f3e5f0d645370925.tar.zst nixpkgs-34d8d08fdd2bfa089dc670a6f3e5f0d645370925.zip | |
Merge pull request #259361 from doronbehar/pkg/transmission
transmission_4: fix darwin build
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/transmission/4.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/p2p/transmission/default.nix | 11 |
2 files changed, 9 insertions, 14 deletions
diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 07cdbcd25d5..78f5b6cf254 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -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; }; -} +}) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 1cfa057a73e..58de6fa9754 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -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; }; -} +}) |