mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
Pierre Bourdon
GitHub
commit
e5f6200d16
@ -1,96 +0,0 @@
|
||||
{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }:
|
||||
|
||||
let
|
||||
versions = {
|
||||
atom = {
|
||||
version = "1.60.0";
|
||||
sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY=";
|
||||
};
|
||||
|
||||
atom-beta = {
|
||||
version = "1.61.0";
|
||||
beta = 0;
|
||||
sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY=";
|
||||
broken = true;
|
||||
};
|
||||
};
|
||||
|
||||
common = pname: {version, sha256, beta ? null, broken ? false}:
|
||||
let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}";
|
||||
name = "${pname}-${fullVersion}";
|
||||
in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
version = fullVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb";
|
||||
name = "${name}.deb";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
ar p $src data.tar.xz | tar xJ ./usr/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
mv usr/bin usr/share $out
|
||||
rm -rf $out/share/lintian
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# needed for gio executable to be able to delete files
|
||||
--prefix "PATH" : "${glib.bin}/bin"
|
||||
)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
share=$out/share/${pname}
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${atomEnv.libPath}:$share" \
|
||||
$share/atom
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${atomEnv.libPath}" \
|
||||
$share/resources/app/apm/bin/node
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
$share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
|
||||
|
||||
dugite=$share/resources/app.asar.unpacked/node_modules/dugite
|
||||
rm -f $dugite/git/bin/git
|
||||
ln -s ${pkgs.git}/bin/git $dugite/git/bin/git
|
||||
rm -f $dugite/git/libexec/git-core/git
|
||||
ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git
|
||||
|
||||
find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \;
|
||||
|
||||
sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable text editor for the 21st Century";
|
||||
homepage = "https://atom.io/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ offline ysndr ];
|
||||
platforms = platforms.x86_64;
|
||||
inherit broken;
|
||||
};
|
||||
};
|
||||
in lib.mapAttrs common versions
|
||||
@ -1,23 +0,0 @@
|
||||
{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig
|
||||
, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
|
||||
, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
|
||||
, at-spi2-core, libdbusmenu, libdrm, mesa
|
||||
}:
|
||||
|
||||
let
|
||||
packages = [
|
||||
stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu
|
||||
libdrm
|
||||
mesa # required for libgbm
|
||||
];
|
||||
|
||||
libPathNative = lib.makeLibraryPath packages;
|
||||
libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
|
||||
libPath = "${libPathNative}:${libPath64}";
|
||||
|
||||
in { inherit packages libPath; }
|
||||
@ -1,22 +1,32 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, git
|
||||
, runtimeShell
|
||||
, fetchurl
|
||||
, wrapGAppsHook
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, atomEnv
|
||||
, mesa
|
||||
, nss
|
||||
, nspr
|
||||
, xorg
|
||||
, libdrm
|
||||
, libsecret
|
||||
, libxkbcommon
|
||||
, hunspell
|
||||
, pango
|
||||
, systemd
|
||||
, hunspellDicts
|
||||
, useHunspell ? true
|
||||
, languages ? [ "en_US" ]
|
||||
, withNemoAction ? true
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, makeWrapper
|
||||
, asar
|
||||
, python3
|
||||
}:
|
||||
@ -32,13 +42,35 @@ let
|
||||
aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
additionalLibs = lib.makeLibraryPath [
|
||||
newLibpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libsecret
|
||||
mesa
|
||||
nss
|
||||
nspr
|
||||
libdrm
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxshmfence
|
||||
libxkbcommon
|
||||
xorg.libxkbfile
|
||||
pango
|
||||
stdenv.cc.cc.lib
|
||||
systemd
|
||||
];
|
||||
newLibpath = "${atomEnv.libPath}:${additionalLibs}";
|
||||
|
||||
# Hunspell
|
||||
hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, makeDesktopItem
|
||||
, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages
|
||||
, atomEnv, at-spi2-atk, autoPatchelfHook
|
||||
, at-spi2-atk, autoPatchelfHook, alsa-lib, mesa, nss, nspr, xorg
|
||||
, systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland
|
||||
, libglvnd, libkrb5
|
||||
|
||||
@ -67,7 +67,7 @@ let
|
||||
};
|
||||
|
||||
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
|
||||
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages);
|
||||
++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ];
|
||||
|
||||
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ];
|
||||
|
||||
|
||||
@ -4,21 +4,31 @@
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, libuuid
|
||||
, libunwind
|
||||
, libxkbcommon
|
||||
, icu
|
||||
, openssl
|
||||
, zlib
|
||||
, curl
|
||||
, at-spi2-core
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, cairo
|
||||
, cups
|
||||
, curl
|
||||
, dbus
|
||||
, expat
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gnutar
|
||||
, atomEnv
|
||||
, libkrb5
|
||||
, gtk3
|
||||
, icu
|
||||
, libdrm
|
||||
, libunwind
|
||||
, libuuid
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, nspr
|
||||
, nss
|
||||
, openssl
|
||||
, pango
|
||||
, systemd
|
||||
, xorg
|
||||
, zlib
|
||||
}:
|
||||
|
||||
# from justinwoo/azuredatastudio-nix
|
||||
@ -115,20 +125,34 @@ stdenv.mkDerivation rec {
|
||||
sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6";
|
||||
|
||||
rpath = lib.concatStringsSep ":" [
|
||||
atomEnv.libPath
|
||||
(
|
||||
lib.makeLibraryPath [
|
||||
libuuid
|
||||
at-spi2-core
|
||||
at-spi2-atk
|
||||
stdenv.cc.cc.lib
|
||||
libkrb5
|
||||
libdrm
|
||||
libxkbcommon
|
||||
mesa
|
||||
xorg.libxshmfence
|
||||
]
|
||||
)
|
||||
(lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
mesa
|
||||
nss
|
||||
nspr
|
||||
libdrm
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxshmfence
|
||||
libxkbcommon
|
||||
xorg.libxkbfile
|
||||
pango
|
||||
stdenv.cc.cc.lib
|
||||
systemd
|
||||
])
|
||||
targetPath
|
||||
sqltoolsserviceRpath
|
||||
];
|
||||
|
||||
@ -1,4 +1,31 @@
|
||||
{ stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, libxkbcommon, libxshmfence, at-spi2-atk, icu, openssl, zlib }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, buildFHSEnv
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, mesa
|
||||
, nss
|
||||
, nspr
|
||||
, libdrm
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, libxshmfence
|
||||
, pango
|
||||
, systemd
|
||||
, icu
|
||||
, openssl
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
pname = "sidequest";
|
||||
version = "0.10.33";
|
||||
@ -21,20 +48,46 @@
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
installPhase = ''
|
||||
mkdir -p "$out/lib/SideQuest" "$out/bin"
|
||||
tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
|
||||
|
||||
ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
|
||||
'';
|
||||
|
||||
fixupPhase
|
||||
|
||||
# mkdir -p "$out/share/applications"
|
||||
# ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
|
||||
|
||||
postFixup = let
|
||||
libPath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
mesa
|
||||
nss
|
||||
nspr
|
||||
libdrm
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxshmfence
|
||||
libxkbcommon
|
||||
xorg.libxkbfile
|
||||
pango
|
||||
stdenv.cc.cc.lib
|
||||
systemd
|
||||
];
|
||||
in ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
|
||||
--set-rpath "${libPath}:$out/lib/SideQuest" \
|
||||
"$out/lib/SideQuest/sidequest"
|
||||
'';
|
||||
};
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ atomEnv
|
||||
, autoPatchelfHook
|
||||
{ autoPatchelfHook
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, makeDesktopItem
|
||||
@ -7,7 +6,13 @@
|
||||
, lib
|
||||
, stdenv
|
||||
, udev
|
||||
, alsa-lib
|
||||
, mesa
|
||||
, nss
|
||||
, nspr
|
||||
, systemd
|
||||
, wrapGAppsHook
|
||||
, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
@ -40,9 +45,7 @@ let
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/Automattic/simplenote-electron/releases/download/"
|
||||
+ "v${version}/Simplenote-linux-${version}-amd64.deb";
|
||||
url = "https://github.com/Automattic/simplenote-electron/releases/download/v${version}/Simplenote-linux-${version}-amd64.deb";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
@ -61,6 +64,7 @@ let
|
||||
dontPatchELF = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
@ -68,7 +72,16 @@ let
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = atomEnv.packages;
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
mesa
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
nss
|
||||
nspr
|
||||
stdenv.cc.cc
|
||||
systemd
|
||||
];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
|
||||
@ -1,15 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, atomEnv
|
||||
, electron_26
|
||||
, systemd
|
||||
, pulseaudio
|
||||
, libxshmfence
|
||||
, libnotify
|
||||
, libappindicator-gtk3
|
||||
, makeWrapper
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
let
|
||||
@ -38,18 +31,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}"));
|
||||
|
||||
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
|
||||
|
||||
buildInputs = atomEnv.packages ++ [
|
||||
libxshmfence
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
(lib.getLib systemd)
|
||||
pulseaudio
|
||||
libnotify
|
||||
libappindicator-gtk3
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -1,24 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, runtimeShell
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, wrapGAppsHook
|
||||
, dpkg
|
||||
, atomEnv
|
||||
, libuuid
|
||||
, libappindicator-gtk3
|
||||
, pulseaudio
|
||||
, at-spi2-atk
|
||||
, coreutils
|
||||
, gawk
|
||||
, xdg-utils
|
||||
, systemd
|
||||
, asar
|
||||
, xar
|
||||
, cpio
|
||||
, makeWrapper
|
||||
, enableRectOverlay ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ atomEnv
|
||||
, autoPatchelfHook
|
||||
{ autoPatchelfHook
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, makeDesktopItem
|
||||
@ -11,7 +10,11 @@
|
||||
, cpio
|
||||
, xar
|
||||
, libdbusmenu
|
||||
, libxshmfence
|
||||
, alsa-lib
|
||||
, mesa
|
||||
, nss
|
||||
, nspr
|
||||
, systemd
|
||||
}:
|
||||
|
||||
let
|
||||
@ -64,8 +67,7 @@ let
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wire-app.wire.com/linux/debian/pool/main/"
|
||||
+ "Wire-${version}_amd64.deb";
|
||||
url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
@ -85,6 +87,7 @@ let
|
||||
dontPatchELF = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
@ -92,7 +95,13 @@ let
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ libxshmfence ] ++ atomEnv.packages;
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
mesa
|
||||
nss
|
||||
nspr
|
||||
systemd
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
@ -132,8 +141,7 @@ let
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wireapp/wire-desktop/releases/download/"
|
||||
+ "macos%2F${version}/Wire.pkg";
|
||||
url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ atomEnv
|
||||
, autoPatchelfHook
|
||||
{ autoPatchelfHook
|
||||
, squashfsTools
|
||||
, alsa-lib
|
||||
, fetchurl
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, lib
|
||||
, libsecret
|
||||
, mesa
|
||||
, udev
|
||||
, wrapGAppsHook
|
||||
, libxshmfence
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -41,9 +42,14 @@ stdenv.mkDerivation rec {
|
||||
dontPatchELF = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron
|
||||
nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ];
|
||||
|
||||
buildInputs = atomEnv.packages ++ [ libxshmfence ];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libsecret
|
||||
mesa
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, lib, unzip, autoPatchelfHook
|
||||
, fetchurl, atomEnv, makeWrapper
|
||||
, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence
|
||||
, fetchurl, makeWrapper
|
||||
, alsa-lib, mesa, nss, nspr, systemd
|
||||
, makeDesktopItem, copyDesktopItems, wrapGAppsHook
|
||||
, metaCommon
|
||||
}:
|
||||
|
||||
@ -24,6 +25,7 @@ let
|
||||
|
||||
src = fetchurl linuxSource;
|
||||
|
||||
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
@ -31,7 +33,14 @@ let
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = atomEnv.packages ++ [ libxshmfence ];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
mesa
|
||||
nss
|
||||
nspr
|
||||
stdenv.cc.cc
|
||||
systemd
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
@ -64,8 +73,9 @@ let
|
||||
'';
|
||||
|
||||
# LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
|
||||
# Error: libstdc++.so.6: cannot open shared object file: No such file or directory
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath})
|
||||
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs})
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
@ -1,29 +1,9 @@
|
||||
{ lib, stdenv
|
||||
, libXScrnSaver
|
||||
, makeWrapper
|
||||
, fetchurl
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk3
|
||||
, unzip
|
||||
, atomEnv
|
||||
, libuuid
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, libdrm
|
||||
, mesa
|
||||
, libxkbcommon
|
||||
, libappindicator-gtk3
|
||||
, libxshmfence
|
||||
, libglvnd
|
||||
, wayland
|
||||
}@args:
|
||||
{ callPackage }:
|
||||
|
||||
let
|
||||
mkElectron = import ./generic.nix args;
|
||||
mkElectron = callPackage ./generic.nix { };
|
||||
in
|
||||
rec {
|
||||
|
||||
electron-bin = electron_26-bin;
|
||||
|
||||
electron_10-bin = mkElectron "10.4.7" {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, libXScrnSaver
|
||||
, makeWrapper
|
||||
, fetchurl
|
||||
@ -6,17 +7,23 @@
|
||||
, glib
|
||||
, gtk3
|
||||
, unzip
|
||||
, atomEnv
|
||||
, libuuid
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, libdrm
|
||||
, mesa
|
||||
, libxkbcommon
|
||||
, libappindicator-gtk3
|
||||
, libxshmfence
|
||||
, libglvnd
|
||||
, wayland
|
||||
, alsa-lib
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, gdk-pixbuf
|
||||
, nss
|
||||
, nspr
|
||||
, xorg
|
||||
, pango
|
||||
, systemd
|
||||
}:
|
||||
|
||||
version: hashes:
|
||||
@ -64,13 +71,35 @@ let
|
||||
passthru.headers = headersFetcher version hashes.headers;
|
||||
};
|
||||
|
||||
electronLibPath = with lib; makeLibraryPath (
|
||||
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ]
|
||||
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
|
||||
++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ]
|
||||
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
|
||||
++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ]
|
||||
++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
|
||||
electronLibPath = lib.makeLibraryPath ([
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
nss
|
||||
nspr
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxkbfile
|
||||
pango
|
||||
stdenv.cc.cc.lib
|
||||
systemd
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ]
|
||||
++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ]
|
||||
++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ]
|
||||
++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ]
|
||||
++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libglvnd ]
|
||||
);
|
||||
|
||||
linux = {
|
||||
@ -95,7 +124,7 @@ let
|
||||
postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/libexec/electron" \
|
||||
--set-rpath "${electronLibPath}:$out/libexec/electron" \
|
||||
$out/libexec/electron/.electron-wrapped \
|
||||
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" }
|
||||
'';
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ atomEnv
|
||||
, autoPatchelfHook
|
||||
{ autoPatchelfHook
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, makeDesktopItem
|
||||
@ -8,6 +7,11 @@
|
||||
, stdenv
|
||||
, lib
|
||||
, wrapGAppsHook
|
||||
, alsa-lib
|
||||
, nss
|
||||
, nspr
|
||||
, systemd
|
||||
, xorg
|
||||
}:
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
@ -39,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
dontPatchELF = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
@ -46,7 +51,14 @@ stdenv.mkDerivation rec {
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = atomEnv.packages;
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
nss
|
||||
nspr
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
systemd
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
# The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
|
||||
|
||||
@ -109,6 +109,10 @@ mapAliases ({
|
||||
asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19
|
||||
at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
|
||||
at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
|
||||
atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01
|
||||
atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01
|
||||
atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01
|
||||
atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01
|
||||
aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
|
||||
audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09
|
||||
audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09
|
||||
|
||||
@ -30634,12 +30634,6 @@ with pkgs;
|
||||
|
||||
atlassian-cli = callPackage ../applications/office/atlassian-cli { };
|
||||
|
||||
atomEnv = callPackage ../applications/editors/atom/env.nix { };
|
||||
|
||||
atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { });
|
||||
|
||||
inherit (atomPackages) atom atom-beta;
|
||||
|
||||
pulsar = callPackage ../applications/editors/pulsar { };
|
||||
|
||||
asap = callPackage ../tools/audio/asap { };
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) {
|
||||
inherit (super)
|
||||
apacheHttpdPackages
|
||||
atomPackages
|
||||
fdbPackages
|
||||
fusePackages
|
||||
gns3Packages
|
||||
|
||||
Loading…
Reference in New Issue
Block a user