diff --git a/pkgs/default.nix b/pkgs/default.nix index c3d59c2b..21e709cc 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,48 +5,51 @@ with pkgs; let packages = self: let callPackage = newScope self; - in { - poppler_21_08 = poppler.overrideAttrs (super: rec { - version = "21.08.0"; - src = fetchurl { - url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-6c9dxZZLzkuwJk0cT4EicGyRBYi0Ic/DCryX1rI+YC0="; - }; - }); - gstreamer_1_18_5 = gst_all_1.gstreamer.overrideAttrs (super: rec { - version = "1.18.5"; - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/${super.pname}/${super.pname}-${version}.tar.xz"; - sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao="; - }; - }); - gstreamer_plugins_base_1_18_5 = gst_all_1.gst-plugins-base.overrideAttrs (super: rec { - version = "1.18.5"; - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/${super.pname}/${super.pname}-${version}.tar.xz"; - sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M="; - }; - }); - doggo = callPackage ./doggo.nix { }; - gnome-shell-extension-burn-my-windows = - callPackage ./gnome-shell-extension-burn-my-windows.nix { }; - gnome-shell-extension-desktop-cube = - callPackage ./gnome-shell-extension-desktop-cube.nix { }; - gnome-shell-extension-fly-pie = - callPackage ./gnome-shell-extension-fly-pie.nix { }; - gnome-shell-extension-pop-shell = - callPackage ./gnome-shell-extension-pop-shell.nix { }; - guile-config = callPackage ./guile-config.nix { }; - guile-hall = callPackage ./guile-hall.nix { }; - guix-binary = callPackage ./guix-binary.nix { }; - junction = callPackage ./junction.nix { }; - libcs50 = callPackage ./libcs50.nix { }; - pop-launcher = callPackage ./pop-launcher.nix { }; - pop-launcher-plugin-duckduckgo-bangs = - callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { }; - rnote = callPackage ./rnote.nix { }; - tic-80 = callPackage ./tic-80 { }; - sioyek = libsForQt5.callPackage ./sioyek.nix { }; - vpaint = libsForQt5.callPackage ./vpaint.nix { }; - }; + in { + poppler_21_08 = poppler.overrideAttrs (super: rec { + version = "21.08.0"; + src = fetchurl { + url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; + sha256 = "sha256-6c9dxZZLzkuwJk0cT4EicGyRBYi0Ic/DCryX1rI+YC0="; + }; + }); + gstreamer_1_18_5 = gst_all_1.gstreamer.overrideAttrs (super: rec { + version = "1.18.5"; + src = fetchurl { + url = + "https://gstreamer.freedesktop.org/src/${super.pname}/${super.pname}-${version}.tar.xz"; + sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao="; + }; + }); + gstreamer_plugins_base_1_18_5 = gst_all_1.gst-plugins-base.overrideAttrs + (super: rec { + version = "1.18.5"; + src = fetchurl { + url = + "https://gstreamer.freedesktop.org/src/${super.pname}/${super.pname}-${version}.tar.xz"; + sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M="; + }; + }); + doggo = callPackage ./doggo.nix { }; + gnome-shell-extension-burn-my-windows = + callPackage ./gnome-shell-extension-burn-my-windows.nix { }; + gnome-shell-extension-desktop-cube = + callPackage ./gnome-shell-extension-desktop-cube.nix { }; + gnome-shell-extension-fly-pie = + callPackage ./gnome-shell-extension-fly-pie.nix { }; + gnome-shell-extension-pop-shell = + callPackage ./gnome-shell-extension-pop-shell.nix { }; + guile-config = callPackage ./guile-config.nix { }; + guile-hall = callPackage ./guile-hall.nix { }; + guix-binary = callPackage ./guix-binary.nix { }; + junction = callPackage ./junction.nix { }; + libcs50 = callPackage ./libcs50.nix { }; + pop-launcher = callPackage ./pop-launcher.nix { }; + pop-launcher-plugin-duckduckgo-bangs = + callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { }; + rnote = callPackage ./rnote.nix { }; + tic-80 = callPackage ./tic-80 { }; + sioyek = libsForQt5.callPackage ./sioyek.nix { }; + vpaint = libsForQt5.callPackage ./vpaint.nix { }; + }; in lib.fix (lib.extends overrides packages) diff --git a/pkgs/guix-binary.nix b/pkgs/guix-binary.nix index 3f44f4c1..71d789d2 100644 --- a/pkgs/guix-binary.nix +++ b/pkgs/guix-binary.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { name = "guix-binary-${version}"; version = "1.3.0"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/guix/guix-binary-${version}.${stdenv.targetPlatform.system}.tar.xz"; + url = + "https://ftp.gnu.org/gnu/guix/guix-binary-${version}.${stdenv.targetPlatform.system}.tar.xz"; sha256 = { "x86_64-linux" = "sha256-xffvtIlHVF5J0tr0jQ+DLzXSqNGfZdqvYHlCWsMnwFA="; "i686-linux" = "sha256-QHOK7hFh8LmRFK+EnNBNqfDNwQ0ia0lqRiHov9uyG2Q="; diff --git a/pkgs/junction.nix b/pkgs/junction.nix index 6ef60e16..4a4a20ed 100644 --- a/pkgs/junction.nix +++ b/pkgs/junction.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-lU6dGsX6jYYmwRz0z4V+4xTFAikUYCsszNVoyc7snwM="; }; - nativeBuildInputs = [ meson_0_60 ninja wrapGAppsHook4 ]; - - buildInputs = [ - libadwaita - gjs + nativeBuildInputs = [ + meson_0_60 + ninja + wrapGAppsHook4 gobject-introspection appstream-glib desktop-file-utils - gsettings-desktop-schemas ]; + buildInputs = [ libadwaita gjs gsettings-desktop-schemas ]; + preFixup = '' substituteInPlace $out/bin/re.sonny.Junction --replace "#!/usr/bin/env -S gjs" "#!${gjs}/bin/gjs" ''; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sonnyp/Junction"; description = "Application chooser"; license = licenses.gpl3; + mainProgram = "re.sonny.Junction"; }; }