diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-13 19:32:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-13 19:32:52 +0100 |
commit | 96c17beaf51747b7785d66512b7033c77e2c81b7 (patch) | |
tree | 1505d2b7604e198edc19357713b0de1a830d40cd /pkgs/tools/X11 | |
parent | cf6b299a38ad35f5f436001eac51d6a964a9e53d (diff) | |
parent | 9480444dae9d35419e4d06777f8ca2f6013d6984 (diff) |
Merge pull request #145205 from Stunkymonkey/treewide-pname-version-1
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/primus/lib.nix | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index d2f779ddd724f..43e0a8233fd0b 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, libX11, libGL, mesa +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, libX11 +, libGL +, mesa , nvidia_x11 ? null , libglvnd }: @@ -10,8 +15,10 @@ let else if nvidia_x11.useGLVND then libglvnd else nvidia_x11; -in stdenv.mkDerivation { - name = "primus-lib-2015-04-28"; +in +stdenv.mkDerivation { + pname = "primus-lib"; + version = "unstable-2015-04-28"; src = fetchFromGitHub { owner = "amonakov"; @@ -30,11 +37,12 @@ in stdenv.mkDerivation { buildInputs = [ libX11 libGL ]; - makeFlags = [ "LIBDIR=$(out)/lib" - "PRIMUS_libGLa=${aPackage}/lib/libGL.so" - "PRIMUS_libGLd=${libGL}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" - ]; + makeFlags = [ + "LIBDIR=$(out)/lib" + "PRIMUS_libGLa=${aPackage}/lib/libGL.so" + "PRIMUS_libGLd=${libGL}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + ]; installPhase = '' ln -s $out/lib/libGL.so.1 $out/lib/libGL.so |