Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8ca59e0a39a2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb09ec0ac922
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 9, 2019

  1. jgmenu: 1.1 -> 3.0

    @romildo
    romildo committed Jun 9, 2019
    Copy the full SHA
    94633e2 View commit details

  2. Merge pull request #62821 from romildo/upd.jgmenu 

    jgmenu: 1.1 -> 3.0
    @Ma27
    Ma27 authored Jun 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eb09ec0 View commit details
Showing with 12 additions and 6 deletions.
  1. +12 −6 pkgs/applications/misc/jgmenu/default.nix
18 changes: 12 additions & 6 deletions pkgs/applications/misc/jgmenu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg }:
{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }:

stdenv.mkDerivation rec {
name = "jgmenu-${version}";
version = "1.1";
pname = "jgmenu";
version = "3.0";

src = fetchFromGitHub {
owner = "johanmalm";
repo = "jgmenu";
repo = pname;
rev = "v${version}";
sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz";
sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl";
};

nativeBuildInputs = [
pkgconfig
makeWrapper
python3Packages.wrapPython
];

@@ -22,12 +23,17 @@ stdenv.mkDerivation rec {
libxml2
menu-cache
xorg.libXinerama
xorg.libXrandr
python3Packages.python
];

makeFlags = [ "prefix=$(out)" ];
makeFlags = [ "prefix=${placeholder "out"}" ];

postFixup = ''
wrapPythonProgramsIn "$out/lib/jgmenu"
for f in $out/bin/jgmenu{,_run}; do
wrapProgram $f --prefix PATH : $out/bin
done
'';

meta = with stdenv.lib; {