-
-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Overrides should only be on the "default" package not the other way around.
- Loading branch information
1 parent
4654643
commit 48a1345
Showing
1 changed file
with
35 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2700,11 +2700,11 @@ with pkgs; | |
|
||
grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; | ||
This comment has been minimized.
Sorry, something went wrong. |
||
|
||
grub2_efi = grub2_full.override { | ||
grub2_efi = grub2.override { | ||
efiSupport = true; | ||
}; | ||
|
||
grub2_light = grub2_full.override { | ||
grub2_light = grub2.override { | ||
zfsSupport = false; | ||
}; | ||
|
||
|
@@ -3721,12 +3721,14 @@ with pkgs; | |
|
||
mitmproxy = callPackage ../tools/networking/mitmproxy { }; | ||
|
||
mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; | ||
|
||
mjpegtools = self.mjpegtoolsFull.override { | ||
mjpegtools = callPackage ../tools/video/mjpegtools { | ||
withMinimal = true; | ||
}; | ||
|
||
mjpegtoolsFull = mjpegtools.override { | ||
withMinimal = false; | ||
}; | ||
|
||
mkcue = callPackage ../tools/cd-dvd/mkcue { }; | ||
|
||
mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); | ||
|
@@ -4310,28 +4312,27 @@ with pkgs; | |
|
||
philter = callPackage ../tools/networking/philter { }; | ||
|
||
pinentry = pinentry_ncurses.override { | ||
inherit gtk2; | ||
pinentry = callPackage ../tools/security/pinentry { | ||
libcap = if stdenv.isDarwin then null else libcap; | ||
}; | ||
|
||
pinentry_ncurses = callPackage ../tools/security/pinentry { | ||
libcap = if stdenv.isDarwin then null else libcap; | ||
pinentry_ncurses = pinentry.override { | ||
gtk2 = null; | ||
}; | ||
|
||
pinentry_emacs = pinentry_ncurses.override { | ||
pinentry_emacs = pinentry.override { | ||
enableEmacs = true; | ||
This comment has been minimized.
Sorry, something went wrong.
jtojnar
Contributor
|
||
}; | ||
|
||
pinentry_gnome = pinentry_ncurses.override { | ||
pinentry_gnome = pinentry.override { | ||
gcr = gnome3.gcr; | ||
}; | ||
|
||
pinentry_qt4 = pinentry_ncurses.override { | ||
pinentry_qt4 = pinentry.override { | ||
qt = qt4; | ||
}; | ||
|
||
pinentry_qt5 = pinentry_ncurses.override { | ||
pinentry_qt5 = pinentry.override { | ||
qt = qt5.qtbase; | ||
}; | ||
|
||
|
@@ -4354,7 +4355,7 @@ with pkgs; | |
plan9port = callPackage ../tools/system/plan9port { }; | ||
|
||
platformioPackages = callPackage ../development/arduino/platformio { }; | ||
platformio = platformioPackages.platformio-chrootenv.override {}; | ||
platformio = platformioPackages.platformio-chrootenv; | ||
|
||
platinum-searcher = callPackage ../tools/text/platinum-searcher { }; | ||
|
||
|
@@ -9293,7 +9294,7 @@ with pkgs; | |
libheimdal = heimdalFull.override { type = "lib"; }; | ||
|
||
harfbuzz = callPackage ../development/libraries/harfbuzz { }; | ||
harfbuzz-icu = callPackage ../development/libraries/harfbuzz { | ||
harfbuzz-icu = harfbuzz.override { | ||
withIcu = true; | ||
withGraphite2 = true; | ||
}; | ||
|
@@ -9480,10 +9481,11 @@ with pkgs; | |
|
||
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; | ||
|
||
krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { | ||
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { | ||
inherit (darwin) bootstrap_cmds; | ||
}; | ||
libkrb5 = krb5Full.override { | ||
krb5Full = krb5; | ||
libkrb5 = krb5.override { | ||
fetchurl = fetchurlBoot; | ||
type = "lib"; | ||
}; | ||
|
@@ -9675,14 +9677,12 @@ with pkgs; | |
|
||
libdbi = callPackage ../development/libraries/libdbi { }; | ||
|
||
libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { | ||
libdbiDriversBase = libdbiDrivers.override { | ||
mysql = null; | ||
sqlite = null; | ||
}; | ||
|
||
libdbiDrivers = libdbiDriversBase.override { | ||
inherit sqlite mysql; | ||
}; | ||
libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; | ||
|
||
libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; | ||
libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; }; | ||
|
@@ -15639,16 +15639,16 @@ with pkgs; | |
|
||
welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; | ||
|
||
wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { | ||
withQt = false; | ||
wireshark = callPackage ../applications/networking/sniffers/wireshark { | ||
withQt = true; | ||
withGtk = false; | ||
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; | ||
}; | ||
wireshark-qt = wireshark; | ||
|
||
# The GTK UI is deprecated by upstream. You probably want the QT version. | ||
wireshark-gtk = wireshark-cli.override { withGtk = true; }; | ||
wireshark-qt = wireshark-cli.override { withQt = true; }; | ||
wireshark = wireshark-qt; | ||
wireshark-gtk = wireshark.override { withGtk = true; }; | ||
This comment has been minimized.
Sorry, something went wrong.
jtojnar
Contributor
|
||
wireshark-cli = wireshark.override { withGtk = false; withQt = false; }; | ||
|
||
fbida = callPackage ../applications/graphics/fbida { }; | ||
|
||
|
@@ -16166,13 +16166,12 @@ with pkgs; | |
libwebp = null; | ||
}; | ||
|
||
imagemagick = imagemagickBig.override { | ||
imagemagick = callPackage ../applications/graphics/ImageMagick { | ||
inherit (darwin.apple_sdk.frameworks) ApplicationServices; | ||
ghostscript = null; | ||
}; | ||
|
||
imagemagickBig = callPackage ../applications/graphics/ImageMagick { | ||
inherit (darwin.apple_sdk.frameworks) ApplicationServices; | ||
}; | ||
imagemagickBig = imagemagick.override { inherit ghostscript; }; | ||
|
||
imagemagick7_light = lowPrio (imagemagick7.override { | ||
bzip2 = null; | ||
|
@@ -19750,12 +19749,12 @@ with pkgs; | |
# and with or without atlas as a dependency. The default `liblapack` is 3.4.1 | ||
# with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 | ||
# without atlas. Etc. | ||
liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; | ||
liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; | ||
liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; | ||
liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; | ||
liblapack = liblapackWithAtlas; | ||
liblapack_3_5_0 = liblapack_3_5_0WithAtlas; | ||
liblapack = callPackage ../development/libraries/science/math/liblapack {}; | ||
liblapackWithAtlas = liblapack; | ||
liblapackWithoutAtlas = liblapack.override { atlas = null; }; | ||
liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; | ||
liblapack_3_5_0WithAtlas = liblapack_3_5_0; | ||
liblapack_3_5_0WithoutAtlas = liblapack_3_5_0.override { atlas = null; }; | ||
|
||
liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; | ||
|
||
|
This should have probably been normalised like
krb5Full
.