tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
emacs: small rewrite
Anderson Torres
2 years ago
b2fae248
1fa1861e
+7
-2
1 changed file
expand all
collapse all
unified
split
pkgs
applications
editors
emacs
default.nix
+7
-2
pkgs/applications/editors/emacs/default.nix
···
4
4
let
5
5
gconf = pkgs.gnome2.GConf;
6
6
inherit (self) callPackage;
7
7
-
stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
7
7
+
stdenv = if pkgs.stdenv.isDarwin
8
8
+
then pkgs.darwin.apple_sdk_11_0.stdenv
9
9
+
else pkgs.stdenv;
8
10
inheritedArgs = {
9
11
inherit gconf;
10
12
inherit stdenv;
···
16
18
Quartz QuartzCore UniformTypeIdentifiers WebKit;
17
19
gnutls =
18
20
if pkgs.stdenv.isDarwin
19
19
-
then pkgs.gnutls.override { inherit stdenv; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; }
21
21
+
then pkgs.gnutls.override {
22
22
+
inherit stdenv;
23
23
+
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
24
24
+
}
20
25
else pkgs.gnutls;
21
26
};
22
27
in {